mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-12-29 00:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert timeline behavior to the v1.2 default (#4024)

Browse Source 
This change was introduced in dd7e27a098
as a possible fix for #4024, but the change is too disruptive to be
introduced at this stage, we need some extra UI elements to make the
drag & drop accessible in both modes: the default v1.2 behavior, and
a possible new selection mode, e.g. #1498
This commit is contained in:
David Capello 2023-10-25 08:36:54 -03:00
parent 83b1acac7c
commit ae3b2dd144
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/pref.xml
View File

@ -201,7 +201,7 @@
</section>
<section id="timeline">
<option id="keep_selection" type="bool" default="false" />
<option id="select_on_click" type="bool" default="false" />
<option id="select_on_click" type="bool" default="true" />
<option id="select_on_click_with_key" type="bool" default="true" />
<option id="select_on_drag" type="bool" default="true" />
<option id="drag_and_drop_from_edges" type="bool" default="true" />

1
data/strings/en.ini
View File

@ -1679,7 +1679,6 @@ when we press the mouse button and after we move
the mouse to another position.
END
drag_and_drop_from_edges = Drag && drop from edges
reset_as_v12 = Reset as Aseprite v1.2
default_first_frame = Default First Frame:
ui_mouse_cursor = UI Mouse Cursor
native_cursor = Use native mouse cursors

3
data/widgets/options.xml
View File

@ -301,9 +301,8 @@
text="@.drag_and_drop_from_edges"
pref="timeline.drag_and_drop_from_edges" />
<hbox>
<hbox expansive="true" />
<boxfiller />
<button id="reset_timeline_sel" text="@general.reset" width="60" />
<button id="reset_timeline_sel_as_v12" text="@.reset_as_v12" />
</hbox>
</vbox>

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

@ -334,7 +334,6 @@ public:
// Timeline
firstFrame()->setTextf("%d", m_globPref.timeline.firstFrame());
resetTimelineSel()->Click.connect([this]{ onResetTimelineSel(); });
resetTimelineSelAsV12()->Click.connect([this]{ onResetTimelineSelV12(); });
// Others
if (m_pref.general.expandMenubarOnMouseover())
@ -1706,21 +1705,12 @@ private:
layout();
}
void onResetTimelineSelCommon() {
keepSelection()->setSelected(false);
selectOnClickWithKey()->setSelected(true);
selectOnDrag()->setSelected(true);
dragAndDropFromEdges()->setSelected(true);
}
void onResetTimelineSel() {
onResetTimelineSelCommon();
selectOnClick()->setSelected(false);
}
void onResetTimelineSelV12() {
onResetTimelineSelCommon();
selectOnClick()->setSelected(true);
keepSelection()->setSelected(m_pref.timeline.keepSelection.defaultValue());
selectOnClick()->setSelected(m_pref.timeline.selectOnClick.defaultValue());
selectOnClickWithKey()->setSelected(m_pref.timeline.selectOnClickWithKey.defaultValue());
selectOnDrag()->setSelected(m_pref.timeline.selectOnDrag.defaultValue());
dragAndDropFromEdges()->setSelected(m_pref.timeline.dragAndDropFromEdges.defaultValue());
}
gfx::Rect gridBounds() const {