fix #2080 - added option to toggle shellmap in CNC
This commit is contained in:
committed by
Chris Forbes
parent
8df09da816
commit
bd29d382c7
@@ -86,6 +86,10 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
|
|||||||
Game.viewport.Zoom = graphicsSettings.PixelDouble ? 2 : 1;
|
Game.viewport.Zoom = graphicsSettings.PixelDouble ? 2 : 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
var showShellmapCheckbox = generalPane.Get<CheckboxWidget>("SHOW_SHELLMAP");
|
||||||
|
showShellmapCheckbox.IsChecked = () => gameSettings.ShowShellmap;
|
||||||
|
showShellmapCheckbox.OnClick = () => gameSettings.ShowShellmap ^= true;
|
||||||
|
|
||||||
generalPane.Get("WINDOW_RESOLUTION").IsVisible = () => graphicsSettings.Mode == WindowMode.Windowed;
|
generalPane.Get("WINDOW_RESOLUTION").IsVisible = () => graphicsSettings.Mode == WindowMode.Windowed;
|
||||||
var windowWidth = generalPane.Get<TextFieldWidget>("WINDOW_WIDTH");
|
var windowWidth = generalPane.Get<TextFieldWidget>("WINDOW_WIDTH");
|
||||||
windowWidth.Text = graphicsSettings.WindowedSize.X.ToString();
|
windowWidth.Text = graphicsSettings.WindowedSize.X.ToString();
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ Container@SETTINGS_PANEL:
|
|||||||
Text:Settings
|
Text:Settings
|
||||||
Background@GENERAL_CONTROLS:
|
Background@GENERAL_CONTROLS:
|
||||||
Width:740
|
Width:740
|
||||||
Height:250
|
Height:290
|
||||||
Background:panel-black
|
Background:panel-black
|
||||||
Children:
|
Children:
|
||||||
Label@TITLE:
|
Label@TITLE:
|
||||||
@@ -142,49 +142,56 @@ Container@SETTINGS_PANEL:
|
|||||||
Height:20
|
Height:20
|
||||||
Font:Regular
|
Font:Regular
|
||||||
Text:Enable Pixel Doubling
|
Text:Enable Pixel Doubling
|
||||||
|
Checkbox@SHOW_SHELLMAP:
|
||||||
|
X:375
|
||||||
|
Y:120
|
||||||
|
Width:200
|
||||||
|
Height:20
|
||||||
|
Font:Regular
|
||||||
|
Text:Show Shellmap
|
||||||
Label@AUDIO_TITLE:
|
Label@AUDIO_TITLE:
|
||||||
X:375
|
X:375
|
||||||
Y:130
|
Y:160
|
||||||
Width:340
|
Width:340
|
||||||
Font:Bold
|
Font:Bold
|
||||||
Text:Sound
|
Text:Sound
|
||||||
Align:Center
|
Align:Center
|
||||||
Label@SOUND_LABEL:
|
Label@SOUND_LABEL:
|
||||||
X:375
|
X:375
|
||||||
Y:145
|
Y:175
|
||||||
Width:95
|
Width:95
|
||||||
Height:25
|
Height:25
|
||||||
Align:Right
|
Align:Right
|
||||||
Text:Sound Volume:
|
Text:Sound Volume:
|
||||||
Slider@SOUND_SLIDER:
|
Slider@SOUND_SLIDER:
|
||||||
X:475
|
X:475
|
||||||
Y:150
|
Y:180
|
||||||
Width:240
|
Width:240
|
||||||
Height:20
|
Height:20
|
||||||
Ticks:5
|
Ticks:5
|
||||||
Label@MUSIC_LABEL:
|
Label@MUSIC_LABEL:
|
||||||
X:375
|
X:375
|
||||||
Y:175
|
Y:205
|
||||||
Width:95
|
Width:95
|
||||||
Height:25
|
Height:25
|
||||||
Align:Right
|
Align:Right
|
||||||
Text:Music Volume:
|
Text:Music Volume:
|
||||||
Slider@MUSIC_SLIDER:
|
Slider@MUSIC_SLIDER:
|
||||||
X:475
|
X:475
|
||||||
Y:180
|
Y:210
|
||||||
Width:240
|
Width:240
|
||||||
Height:20
|
Height:20
|
||||||
Ticks:5
|
Ticks:5
|
||||||
Checkbox@SHELLMAP_MUSIC:
|
Checkbox@SHELLMAP_MUSIC:
|
||||||
X:375
|
X:375
|
||||||
Y:210
|
Y:240
|
||||||
Width:200
|
Width:200
|
||||||
Height:20
|
Height:20
|
||||||
Font:Regular
|
Font:Regular
|
||||||
Text:Shellmap Music
|
Text:Shellmap Music
|
||||||
Background@INPUT_CONTROLS:
|
Background@INPUT_CONTROLS:
|
||||||
Width:740
|
Width:740
|
||||||
Height:250
|
Height:290
|
||||||
Background:panel-black
|
Background:panel-black
|
||||||
Visible:false
|
Visible:false
|
||||||
Children:
|
Children:
|
||||||
@@ -260,20 +267,20 @@ Container@SETTINGS_PANEL:
|
|||||||
Font:Regular
|
Font:Regular
|
||||||
Text:Shift-Enter Toggles Team Chat
|
Text:Shift-Enter Toggles Team Chat
|
||||||
Button@GENERAL_BUTTON:
|
Button@GENERAL_BUTTON:
|
||||||
Y:249
|
Y:289
|
||||||
Width:140
|
Width:140
|
||||||
Height:35
|
Height:35
|
||||||
Text:General
|
Text:General
|
||||||
Button@INPUT_BUTTON:
|
Button@INPUT_BUTTON:
|
||||||
X:150
|
X:150
|
||||||
Y:249
|
Y:289
|
||||||
Width:140
|
Width:140
|
||||||
Height:35
|
Height:35
|
||||||
Text:Input
|
Text:Input
|
||||||
Button@BACK_BUTTON:
|
Button@BACK_BUTTON:
|
||||||
Key:escape
|
Key:escape
|
||||||
X:600
|
X:600
|
||||||
Y:249
|
Y:289
|
||||||
Width:140
|
Width:140
|
||||||
Height:35
|
Height:35
|
||||||
Text:Back
|
Text:Back
|
||||||
|
|||||||
Reference in New Issue
Block a user