mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-18 21:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ui_scale option from experimental to general

Browse Source
This commit is contained in:
David Capello 2016-09-09 09:46:10 -03:00
parent 1570cb02ec
commit 68fa996cc6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/pref.xml
View File

@ -86,6 +86,7 @@
<global>
<section id="general">
<option id="screen_scale" type="int" default="0" />
<option id="ui_scale" type="int" default="1" migrate="experimental.ui_scale" />
<option id="gpu_acceleration" type="bool" default="false" />
<option id="visible_timeline" type="bool" default="false" />
<option id="autoshow_timeline" type="bool" default="true" migrate="Options.AutoShowTimeline" />
@ -126,7 +127,6 @@
<option id="mini_font" type="std::string" migrate="Options.UserMiniFont" />
</section>
<section id="experimental" text="Experimental">
<option id="ui_scale" type="int" default="1" />
<option id="use_native_file_dialog" type="bool" default="false" />
<option id="flash_layer" type="bool" default="false" migrate="Options.FlashLayer" />
</section>

6
src/app/commands/cmd_options.cpp
View File

@ -173,7 +173,7 @@ public:
uiScale()->setSelectedItemIndex(
uiScale()->findItemIndexByValue(
base::convert_to<std::string>(m_pref.experimental.uiScale())));
base::convert_to<std::string>(m_pref.general.uiScale())));
if ((int(she::instance()->capabilities()) &
int(she::Capabilities::GpuAccelerationSwitch)) == int(she::Capabilities::GpuAccelerationSwitch)) {
@ -312,8 +312,8 @@ public:
}
int newUIScale = base::convert_to<int>(uiScale()->getValue());
if (newUIScale != m_pref.experimental.uiScale()) {
m_pref.experimental.uiScale(newUIScale);
if (newUIScale != m_pref.general.uiScale()) {
m_pref.general.uiScale(newUIScale);
warnings += "<<- UI Elements Scale";
}

2
src/app/modules/gui.cpp
View File

@ -179,7 +179,7 @@ int init_module_gui()
// Setup the GUI theme for all widgets
gui_theme = new SkinTheme();
gui_theme->setScale(Preferences::instance().experimental.uiScale());
gui_theme->setScale(Preferences::instance().general.uiScale());
CurrentTheme::set(gui_theme);
if (maximized)