mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1710 from Gasparoken/auto-show-selection-edges

Browse Source 
Add option to disable auto show selection edges (fix #1614)
This commit is contained in:
David Capello 2018-04-20 11:34:46 -03:00 committed by GitHub
commit 3ddb3d054b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/pref.xml
View File

@ -207,6 +207,7 @@
<option id="opaque" type="bool" default="false" />
<option id="auto_opaque" type="bool" default="true" />
<option id="keep_selection_after_clear" type="bool" default="false" />
<option id="auto_show_selection_edges" type="bool" default="true" />
<option id="transparent_color" type="app::Color" />
<option id="rotation_algorithm" type="app::tools::RotationAlgorithm" default="app::tools::RotationAlgorithm::DEFAULT" />
<option id="modify_selection_quantity" type="int" default="1" />

5
data/strings/en.ini
View File

@ -907,6 +907,11 @@ keep_selection_after_clear_tooltip = <<<END
Check this if you want to keep the selection
after deleting it.
END
auto_show_selection_edges = Automatically show selection edges after modifying the selection
auto_show_selection_edges_tooltip = <<<END
Uncheck this if you want to keep the
selection edges option as you wish.
END
move_edges = Allow moving selection edges
move_edges_tooltip = <<<END
Check this if you want to be able to drag

1
data/widgets/options.xml
View File

@ -136,6 +136,7 @@
<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="@.auto_show_selection_edges" id="auto_show_selection_edges" tooltip="@.auto_show_selection_edges_tooltip" />
<check text="@.move_edges" id="move_edges" tooltip="@.move_edges_tooltip" />
<check text="@.modifiers_disable_handles" id="modifiers_disable_handles" tooltip="@.modifiers_disable_handles_tooltip" />
<check text="@.move_on_add_mode" id="move_on_add_mode" tooltip="@.move_on_add_mode_tooltip" />

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

@ -56,8 +56,10 @@ void MaskAllCommand::onExecute(Context* context)
document->resetTransformation();
document->generateMaskBoundaries();
DocumentPreferences& docPref = Preferences::instance().document(document);
docPref.show.selectionEdges(true);
if (Preferences::instance().selection.autoShowSelectionEdges()) {
DocumentPreferences& docPref = Preferences::instance().document(document);
docPref.show.selectionEdges(true);
}
update_screen_for_document(document);
}

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

@ -222,6 +222,9 @@ public:
if (m_pref.selection.keepSelectionAfterClear())
keepSelectionAfterClear()->setSelected(true);
if (m_pref.selection.autoShowSelectionEdges())
autoShowSelectionEdges()->setSelected(true);
if (m_pref.selection.moveEdges())
moveEdges()->setSelected(true);
@ -451,6 +454,7 @@ public:
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.autoShowSelectionEdges(autoShowSelectionEdges()->isSelected());
m_pref.selection.moveEdges(moveEdges()->isSelected());
m_pref.selection.modifiersDisableHandles(modifiersDisableHandles()->isSelected());
m_pref.selection.moveOnAddMode(moveOnAddMode()->isSelected());

3
src/app/ui/editor/tool_loop_impl.cpp
View File

@ -466,7 +466,8 @@ public:
redraw = true;
// Show selection edges
m_docPref.show.selectionEdges(true);
if (Preferences::instance().selection.autoShowSelectionEdges())
m_docPref.show.selectionEdges(true);
}
// Slice ink
else if (getInk()->isSlice()) {