Skip to content

Show unit outlines when hidden UI is enabled #5615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
strategineer wants to merge 1 commit into from
Closed

Show unit outlines when hidden UI is enabled #5615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions LuaUI/Widgets/gfx_outline_shader_gl4.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ local scaleWithHeight = true
local functionScaleWithHeight = true
local zoomScaleRange = 0.4
local overrideDrawBoxes = false
local hideWithUi = true

local function PrintDrawBox()
if overrideDrawBoxes then
Expand All @@ -101,7 +100,7 @@ local function PrintDrawBox()
end

options_path = 'Settings/Graphics/Unit Visibility/Outline'
options_order = {'thickness', 'scaleRange', 'scaleWithHeight', 'functionScaleWithHeight', 'disableWithUi', 'overrideDrawBox', 'overrideDrawBox_x', 'overrideDrawBox_y', 'overrideDrawBox_yoff'}
options_order = {'thickness', 'scaleRange', 'scaleWithHeight', 'functionScaleWithHeight', 'overrideDrawBox', 'overrideDrawBox_x', 'overrideDrawBox_y', 'overrideDrawBox_yoff'}
options = {
thickness = {
name = 'Outline Thickness',
Expand Down Expand Up @@ -143,16 +142,6 @@ options = {
functionScaleWithHeight = self.value
end,
},
disableWithUi = {
name = 'Disable with hidden UI',
desc = 'Toggles outlines with Ctrl+F5.',
type = 'bool',
value = true,
noHotkey = true,
OnChange = function (self)
hideWithUi = self.value
end,
},

-- Debug
overrideDrawBox = {
Expand Down Expand Up @@ -756,7 +745,7 @@ local useStencil = true
local STENCILOPPASS = GL_DECR -- KEEP OR DECR

function widget:DrawWorld()
if (hideWithUi and Spring.IsGUIHidden()) or internalDisabled then
if internalDisabled then
return
end

Expand Down