Skip to content

Commit

Permalink
Add option to disable the new "move selection edges" behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
dacap committed Apr 6, 2017
1 parent e5c1516 commit b8c64b3
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
7 changes: 7 additions & 0 deletions data/strings/en.ini
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ skip = &Skip
title = Preferences
section_general = General
section_editor = Editor
section_selection = Selection
section_timeline = Timeline
section_cursors = Cursors
section_background = Background
Expand Down Expand Up @@ -315,6 +316,12 @@ keep_selection_after_clear_tooltip = <<<END
Check this if you want to keep the selection
after deleting it.
END
move_edges = Allow moving selection edges
move_edges_tooltip = <<<END
Check this if you want to be able to drag
only the selection edges when the mouse is
above them.
END
autotimeline = Show timeline automatically
autotimeline_tooltip = <<<END
Show the timeline automatically
Expand Down
5 changes: 5 additions & 0 deletions data/widgets/options.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<listbox id="section_listbox">
<listitem text="@.section_general" value="section_general" />
<listitem text="@.section_editor" value="section_editor" />
<listitem text="@.section_selection" value="section_selection" />
<listitem text="@.section_timeline" value="section_timeline" />
<listitem text="@.section_cursors" value="section_cursors" />
<listitem text="@.section_background" value="section_bg" />
Expand Down Expand Up @@ -84,10 +85,14 @@
<label text="@.right_click" />
<combobox id="right_click_behavior" expansive="true" />
</hbox>
</vbox>

<!-- Selection -->
<vbox id="section_selection">
<separator text="@.editor_selection" horizontal="true" />
<check text="@.auto_opaque" id="auto_opaque" tooltip="@.auto_opaque_tooltip" />
<check text="@.keep_selection_after_clear" id="keep_selection_after_clear" tooltip="@.keep_selection_after_clear_tooltip" />
<check text="@.move_edges" id="move_edges" tooltip="@.move_edges_tooltip" />
</vbox>

<!-- Timeline -->
Expand Down
4 changes: 4 additions & 0 deletions src/app/commands/cmd_options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ class OptionsWindow : public app::gen::Options {
if (m_pref.selection.keepSelectionAfterClear())
keepSelectionAfterClear()->setSelected(true);

if (m_pref.selection.moveEdges())
moveEdges()->setSelected(true);

#if defined(_WIN32) || defined(__APPLE__)
if (m_pref.cursor.useNativeCursor())
nativeCursor()->setSelected(true);
Expand Down Expand Up @@ -297,6 +300,7 @@ class OptionsWindow : public app::gen::Options {
m_pref.cursor.cursorScale(base::convert_to<int>(cursorScale()->getValue()));
m_pref.selection.autoOpaque(autoOpaque()->isSelected());
m_pref.selection.keepSelectionAfterClear(keepSelectionAfterClear()->isSelected());
m_pref.selection.moveEdges(moveEdges()->isSelected());
m_pref.guides.layerEdgesColor(layerEdgesColor()->getColor());
m_pref.guides.autoGuidesColor(autoGuidesColor()->getColor());
m_pref.slices.defaultColor(defaultSliceColor()->getColor());
Expand Down

0 comments on commit b8c64b3

Please sign in to comment.