mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-01 01:20:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the "invert wheel for brush size" option to Edit > Keyboard Shortcuts > Mouse Wheel

Browse Source
This commit is contained in:
David Capello 2022-05-05 09:26:19 -03:00
parent 04903692f9
commit 7fea99a718
6 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/pref.xml
View File

@ -171,7 +171,7 @@
<option id="zoom_with_slide" type="bool" default="false" /> <option id="zoom_with_slide" type="bool" default="false" />
<option id="zoom_from_center_with_wheel" type="bool" default="false" /> <option id="zoom_from_center_with_wheel" type="bool" default="false" />
<option id="zoom_from_center_with_keys" type="bool" default="false" /> <option id="zoom_from_center_with_keys" type="bool" default="false" />
<option id="invert_brush_size_scroll" type="bool" default="false" /> <option id="invert_brush_size_wheel" type="bool" default="false" />
<option id="show_scrollbars" type="bool" default="true" /> <option id="show_scrollbars" type="bool" default="true" />
<option id="auto_scroll" type="bool" default="true" /> <option id="auto_scroll" type="bool" default="true" />
<option id="right_click_mode" type="RightClickMode" default="RightClickMode::PAINT_BGCOLOR" /> <option id="right_click_mode" type="RightClickMode" default="RightClickMode::PAINT_BGCOLOR" />

2
data/strings/en.ini
View File

@ -799,6 +799,7 @@ section_mouse_wheel = Mouse Wheel
default_wheel_behavior = Default default_wheel_behavior = Default
custom_wheel_behavior = Custom custom_wheel_behavior = Custom
slide_as_wheel = Interpret two fingers slide on Trackpad as mouse wheel slide_as_wheel = Interpret two fingers slide on Trackpad as mouse wheel
invert_brush_size_wheel = Invert the mouse wheel direction for increasing the brush size
ok = &OK ok = &OK
cancel = &Cancel cancel = &Cancel
@ -1126,7 +1127,6 @@ wheel_zoom = Zoom with scroll wheel
slide_zoom = Zoom sliding two fingers up or down slide_zoom = Zoom sliding two fingers up or down
zoom_from_center_with_wheel = Zoom from center with scroll wheel zoom_from_center_with_wheel = Zoom from center with scroll wheel
zoom_from_center_with_keys = Zoom from center with keys zoom_from_center_with_keys = Zoom from center with keys
invert_brush_size_scroll = Invert the scrolling direction for increasing the brush size
show_scrollbars = Show scroll-bars in sprite editor show_scrollbars = Show scroll-bars in sprite editor
show_scrollbars_tooltip = Show scroll-bars in all sprite editors. show_scrollbars_tooltip = Show scroll-bars in all sprite editors.
auto_scroll = Auto-scroll on editor edges auto_scroll = Auto-scroll on editor edges

2
data/widgets/keyboard_shortcuts.xml
View File

@ -49,6 +49,8 @@
pref="editor.zoom_with_wheel" /> pref="editor.zoom_with_wheel" />
<check text="@options.slide_zoom" id="slide_zoom" <check text="@options.slide_zoom" id="slide_zoom"
pref="editor.zoom_with_slide" /> pref="editor.zoom_with_slide" />
<check text="@.invert_brush_size_wheel" id="invert_brush_size_scroll"
pref="editor.invert_brush_size_wheel" />
<view expansive="true"> <view expansive="true">
<listbox id="wheel_actions" /> <listbox id="wheel_actions" />
</view> </view>

1
data/widgets/options.xml
View File

@ -224,7 +224,6 @@
pref="editor.zoom_with_slide" /> pref="editor.zoom_with_slide" />
<check text="@.zoom_from_center_with_wheel" id="zoom_from_center_with_wheel" /> <check text="@.zoom_from_center_with_wheel" id="zoom_from_center_with_wheel" />
<check text="@.zoom_from_center_with_keys" id="zoom_from_center_with_keys" /> <check text="@.zoom_from_center_with_keys" id="zoom_from_center_with_keys" />
<check text="@.invert_brush_size_scroll" id="invert_brush_size_scroll" />
<check text="@.show_scrollbars" id="show_scrollbars" tooltip="@.show_scrollbars_tooltip" /> <check text="@.show_scrollbars" id="show_scrollbars" tooltip="@.show_scrollbars_tooltip" />
<check text="@.auto_scroll" id="auto_scroll" /> <check text="@.auto_scroll" id="auto_scroll" />
<check text="@.auto_fit" id="auto_fit" <check text="@.auto_fit" id="auto_fit"

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

@ -318,9 +318,6 @@ public:
if (m_pref.editor.zoomFromCenterWithKeys()) if (m_pref.editor.zoomFromCenterWithKeys())
zoomFromCenterWithKeys()->setSelected(true); zoomFromCenterWithKeys()->setSelected(true);
if (m_pref.editor.invertBrushSizeScroll())
invertBrushSizeScroll()->setSelected(true);
if (m_pref.selection.autoOpaque()) if (m_pref.selection.autoOpaque())
autoOpaque()->setSelected(true); autoOpaque()->setSelected(true);
@ -628,7 +625,6 @@ public:
m_pref.editor.zoomFromCenterWithWheel(zoomFromCenterWithWheel()->isSelected()); m_pref.editor.zoomFromCenterWithWheel(zoomFromCenterWithWheel()->isSelected());
m_pref.editor.zoomFromCenterWithKeys(zoomFromCenterWithKeys()->isSelected()); m_pref.editor.zoomFromCenterWithKeys(zoomFromCenterWithKeys()->isSelected());
m_pref.editor.invertBrushSizeScroll(invertBrushSizeScroll()->isSelected());
m_pref.editor.showScrollbars(showScrollbars()->isSelected()); m_pref.editor.showScrollbars(showScrollbars()->isSelected());
m_pref.editor.autoScroll(autoScroll()->isSelected()); m_pref.editor.autoScroll(autoScroll()->isSelected());
m_pref.editor.straightLinePreview(straightLinePreview()->isSelected()); m_pref.editor.straightLinePreview(straightLinePreview()->isSelected());

2
src/app/ui/editor/state_with_wheel_behavior.cpp
View File

@ -199,7 +199,7 @@ bool StateWithWheelBehavior::onMouseWheel(Editor* editor, MouseMessage* msg)
// We can configure the mouse wheel for brush size to behave as // We can configure the mouse wheel for brush size to behave as
// in previous versions. // in previous versions.
if (Preferences::instance().editor.invertBrushSizeScroll()) if (Preferences::instance().editor.invertBrushSizeWheel())
dz = -dz; dz = -dz;
brush.size( brush.size(