mirror of
https://github.com/aseprite/aseprite.git
synced 2024-10-06 06:50:07 +00:00
Revert timeline behavior to the v1.2 default (#4024)
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:
parent
83b1acac7c
commit
ae3b2dd144
@ -201,7 +201,7 @@
|
|||||||
</section>
|
</section>
|
||||||
<section id="timeline">
|
<section id="timeline">
|
||||||
<option id="keep_selection" type="bool" default="false" />
|
<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_click_with_key" type="bool" default="true" />
|
||||||
<option id="select_on_drag" type="bool" default="true" />
|
<option id="select_on_drag" type="bool" default="true" />
|
||||||
<option id="drag_and_drop_from_edges" type="bool" default="true" />
|
<option id="drag_and_drop_from_edges" type="bool" default="true" />
|
||||||
|
@ -1679,7 +1679,6 @@ when we press the mouse button and after we move
|
|||||||
the mouse to another position.
|
the mouse to another position.
|
||||||
END
|
END
|
||||||
drag_and_drop_from_edges = Drag && drop from edges
|
drag_and_drop_from_edges = Drag && drop from edges
|
||||||
reset_as_v12 = Reset as Aseprite v1.2
|
|
||||||
default_first_frame = Default First Frame:
|
default_first_frame = Default First Frame:
|
||||||
ui_mouse_cursor = UI Mouse Cursor
|
ui_mouse_cursor = UI Mouse Cursor
|
||||||
native_cursor = Use native mouse cursors
|
native_cursor = Use native mouse cursors
|
||||||
|
@ -301,9 +301,8 @@
|
|||||||
text="@.drag_and_drop_from_edges"
|
text="@.drag_and_drop_from_edges"
|
||||||
pref="timeline.drag_and_drop_from_edges" />
|
pref="timeline.drag_and_drop_from_edges" />
|
||||||
<hbox>
|
<hbox>
|
||||||
<hbox expansive="true" />
|
<boxfiller />
|
||||||
<button id="reset_timeline_sel" text="@general.reset" width="60" />
|
<button id="reset_timeline_sel" text="@general.reset" width="60" />
|
||||||
<button id="reset_timeline_sel_as_v12" text="@.reset_as_v12" />
|
|
||||||
</hbox>
|
</hbox>
|
||||||
</vbox>
|
</vbox>
|
||||||
|
|
||||||
|
@ -334,7 +334,6 @@ public:
|
|||||||
// Timeline
|
// Timeline
|
||||||
firstFrame()->setTextf("%d", m_globPref.timeline.firstFrame());
|
firstFrame()->setTextf("%d", m_globPref.timeline.firstFrame());
|
||||||
resetTimelineSel()->Click.connect([this]{ onResetTimelineSel(); });
|
resetTimelineSel()->Click.connect([this]{ onResetTimelineSel(); });
|
||||||
resetTimelineSelAsV12()->Click.connect([this]{ onResetTimelineSelV12(); });
|
|
||||||
|
|
||||||
// Others
|
// Others
|
||||||
if (m_pref.general.expandMenubarOnMouseover())
|
if (m_pref.general.expandMenubarOnMouseover())
|
||||||
@ -1706,21 +1705,12 @@ private:
|
|||||||
layout();
|
layout();
|
||||||
}
|
}
|
||||||
|
|
||||||
void onResetTimelineSelCommon() {
|
|
||||||
keepSelection()->setSelected(false);
|
|
||||||
selectOnClickWithKey()->setSelected(true);
|
|
||||||
selectOnDrag()->setSelected(true);
|
|
||||||
dragAndDropFromEdges()->setSelected(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
void onResetTimelineSel() {
|
void onResetTimelineSel() {
|
||||||
onResetTimelineSelCommon();
|
keepSelection()->setSelected(m_pref.timeline.keepSelection.defaultValue());
|
||||||
selectOnClick()->setSelected(false);
|
selectOnClick()->setSelected(m_pref.timeline.selectOnClick.defaultValue());
|
||||||
}
|
selectOnClickWithKey()->setSelected(m_pref.timeline.selectOnClickWithKey.defaultValue());
|
||||||
|
selectOnDrag()->setSelected(m_pref.timeline.selectOnDrag.defaultValue());
|
||||||
void onResetTimelineSelV12() {
|
dragAndDropFromEdges()->setSelected(m_pref.timeline.dragAndDropFromEdges.defaultValue());
|
||||||
onResetTimelineSelCommon();
|
|
||||||
selectOnClick()->setSelected(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
gfx::Rect gridBounds() const {
|
gfx::Rect gridBounds() const {
|
||||||
|
Loading…
Reference in New Issue
Block a user