diff options
| author | Eugene Sandulenko | 2017-02-24 22:00:10 +0100 |
|---|---|---|
| committer | GitHub | 2017-02-24 22:00:10 +0100 |
| commit | 8a547c8711a63c07bef974ad9457f57bf5658634 (patch) | |
| tree | c1baf5d112f35dc1b80a3087fb6b164712b03b27 /gui/themes/default.inc | |
| parent | 4b364787863b62f7a141f38646a8772e921fb1e7 (diff) | |
| parent | 45bd7a8b75ebd8227ec4a09e427a66b1bb2796d1 (diff) | |
| download | scummvm-rg350-8a547c8711a63c07bef974ad9457f57bf5658634.tar.gz scummvm-rg350-8a547c8711a63c07bef974ad9457f57bf5658634.tar.bz2 scummvm-rg350-8a547c8711a63c07bef974ad9457f57bf5658634.zip | |
Merge pull request #908 from rsn8887/upstream
SDL: Fix erratic analog pointer + control options
Diffstat (limited to 'gui/themes/default.inc')
| -rw-r--r-- | gui/themes/default.inc | 76 |
1 files changed, 60 insertions, 16 deletions
diff --git a/gui/themes/default.inc b/gui/themes/default.inc index d8baae8d0e..f967067adc 100644 --- a/gui/themes/default.inc +++ b/gui/themes/default.inc @@ -813,17 +813,39 @@ const char *defaultXML1 = "<?xml version = '1.0'?>" "</layout>" "</layout>" "</dialog>" -"<dialog name='GlobalOptions_Control' overlays='Dialog.GlobalOptions.TabWidget'>" -"<layout type='vertical' padding='16,16,16,16' spacing='8'>" -"<widget name='grOnScreenCheckbox' " -"type='Checkbox' " +"<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>" +"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>" +"<widget name = 'grOnScreenCheckbox' " +"type = 'Checkbox' " "/>" -"<widget name='grTouchpadCheckbox' " -"type='Checkbox' " +"<widget name = 'grTouchpadCheckbox' " +"type = 'Checkbox' " "/>" -"<widget name='grSwapMenuAndBackBtnsCheckbox' " -"type='Checkbox' " +"<widget name = 'grSwapMenuAndBackBtnsCheckbox' " +"type = 'Checkbox' " +"/>" +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>" +"<widget name = 'grKbdMouseSpeedDesc' " +"type = 'OptionsLabel' " +"/>" +"<widget name = 'grKbdMouseSpeedSlider' " +"type = 'Slider' " "/>" +"<widget name = 'grKbdMouseSpeedLabel' " +"type = 'SmallLabel' " +"/>" +"</layout>" +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>" +"<widget name = 'grJoystickDeadzoneDesc' " +"type = 'OptionsLabel' " +"/>" +"<widget name = 'grJoystickDeadzoneSlider' " +"type = 'Slider' " +"/>" +"<widget name = 'grJoystickDeadzoneLabel' " +"type = 'SmallLabel' " +"/>" +"</layout>" "</layout>" "</dialog>" "<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>" @@ -2368,17 +2390,39 @@ const char *defaultXML1 = "<?xml version = '1.0'?>" "</layout>" "</layout>" "</dialog>" -"<dialog name='GlobalOptions_Control' overlays='Dialog.GlobalOptions.TabWidget'>" -"<layout type='vertical' padding='16,16,16,16' spacing='6'>" -"<widget name='grOnScreenCheckbox' " -"type='Checkbox' " +"<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>" +"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>" +"<widget name = 'grOnScreenCheckbox' " +"type = 'Checkbox' " "/>" -"<widget name='grTouchpadCheckbox' " -"type='Checkbox' " +"<widget name = 'grTouchpadCheckbox' " +"type = 'Checkbox' " "/>" -"<widget name='grSwapMenuAndBackBtnsCheckbox' " -"type='Checkbox' " +"<widget name = 'grSwapMenuAndBackBtnsCheckbox' " +"type = 'Checkbox' " +"/>" +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>" +"<widget name = 'grKbdMouseSpeedDesc' " +"type = 'OptionsLabel' " +"/>" +"<widget name = 'grKbdMouseSpeedSlider' " +"type = 'Slider' " "/>" +"<widget name = 'grKbdMouseSpeedLabel' " +"type = 'SmallLabel' " +"/>" +"</layout>" +"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>" +"<widget name = 'grJoystickDeadzoneDesc' " +"type = 'OptionsLabel' " +"/>" +"<widget name = 'grJoystickDeadzoneSlider' " +"type = 'Slider' " +"/>" +"<widget name = 'grJoystickDeadzoneLabel' " +"type = 'SmallLabel' " +"/>" +"</layout>" "</layout>" "</dialog>" "<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>" |