mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-27 06:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added possibility to sort a range of palette entries.

Browse Source
This commit is contained in:
David Capello 2010-06-17 00:34:39 -03:00
parent 924fc09a66
commit 636b188283
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/widgets/palette_editor.xml
View File

@ -94,6 +94,13 @@
<view maxsize="true" expansive="true"> <view maxsize="true" expansive="true">
<listbox name="selected_criteria" /> <listbox name="selected_criteria" />
</view> </view>
<separator text="Range to Sort:" left="true" horizontal="true" />
<box horizontal="true">
<label text="First" />
<entry name="first" maxsize="3" text="" expansive="true" />
<label text="Last" />
<entry name="last" maxsize="3" text="" expansive="true" />
</box>
</box> </box>
</box> </box>

30
src/commands/cmd_palette_editor.cpp
View File

@ -418,12 +418,14 @@ struct SortDlgData
Widget* remove_criteria; Widget* remove_criteria;
Widget* asc; Widget* asc;
Widget* des; Widget* des;
Widget* first;
Widget* last;
Widget* ok_button; Widget* ok_button;
}; };
static bool insert_criteria_hook(Widget* widget, void* data); static bool insert_criteria_hook(Widget* widget, void* data);
static bool remove_criteria_hook(Widget* widget, void* data); static bool remove_criteria_hook(Widget* widget, void* data);
static bool sort_by_criteria(Palette* palette, JList selected_listitems); static bool sort_by_criteria(Palette* palette, int from, int to, JList selected_listitems);
static void sort_command(JWidget widget) static void sort_command(JWidget widget)
{ {
@ -440,11 +442,26 @@ static void sort_command(JWidget widget)
"remove_criteria", &data.remove_criteria, "remove_criteria", &data.remove_criteria,
"asc", &data.asc, "asc", &data.asc,
"des", &data.des, "des", &data.des,
"first", &data.first,
"last", &data.last,
"ok_button", &data.ok_button, NULL); "ok_button", &data.ok_button, NULL);
// Selected Ascending by default // Selected Ascending by default
data.asc->setSelected(true); data.asc->setSelected(true);
// Range to sort
int i1 = palette_editor->get1stColor();
int i2 = palette_editor->get2ndColor();
if (i1 == i2) { // Sort all palette entries
i1 = 0;
i2 = get_current_palette()->size()-1;
}
else if (i1 > i2) {
std::swap(i1, i2);
}
data.first->setTextf("%d", i1);
data.last->setTextf("%d", i2);
HOOK(data.insert_criteria, JI_SIGNAL_BUTTON_SELECT, insert_criteria_hook, &data); HOOK(data.insert_criteria, JI_SIGNAL_BUTTON_SELECT, insert_criteria_hook, &data);
HOOK(data.remove_criteria, JI_SIGNAL_BUTTON_SELECT, remove_criteria_hook, &data); HOOK(data.remove_criteria, JI_SIGNAL_BUTTON_SELECT, remove_criteria_hook, &data);
@ -458,8 +475,13 @@ static void sort_command(JWidget widget)
if (dlg->get_killer() == data.ok_button) { if (dlg->get_killer() == data.ok_button) {
Palette* palette = new Palette(*get_current_palette()); Palette* palette = new Palette(*get_current_palette());
int from = data.first->getTextInt();
int to = data.last->getTextInt();
sort_by_criteria(palette, data.selected_criteria->children); from = MID(0, from, palette->size()-1);
to = MID(from, to, palette->size()-1);
sort_by_criteria(palette, from, to, data.selected_criteria->children);
set_new_palette(palette); set_new_palette(palette);
delete palette; delete palette;
@ -543,7 +565,7 @@ static bool remove_criteria_hook(Widget* widget, void* _data)
return true; return true;
} }
static bool sort_by_criteria(Palette* palette, JList selected_listitems) static bool sort_by_criteria(Palette* palette, int from, int to, JList selected_listitems)
{ {
SortPalette* sort_palette = NULL; SortPalette* sort_palette = NULL;
JLink link; JLink link;
@ -612,7 +634,7 @@ static bool sort_by_criteria(Palette* palette, JList selected_listitems)
} }
if (sort_palette) { if (sort_palette) {
palette->sort(0, palette->size()-1, sort_palette); palette->sort(from, to, sort_palette);
delete sort_palette; delete sort_palette;
} }