mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-06 06:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move palette menu to color bar options button

Browse Source
This commit is contained in:
David Capello 2015-05-08 14:36:54 -03:00
parent 6a9382a975
commit 5437ccd2a2
8 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
data/gui.xml
View File

@ -593,14 +593,6 @@
</item>
<item command="ReverseFrames" text="Re&amp;verse Frames" />
</menu>
<menu text="&amp;Palette">
<item command="PaletteEditor" text="&amp;Palette Editor">
<param name="switch" value="true" />
</item>
<separator />
<item command="LoadPalette" text="&amp;Load Palette" />
<item command="SavePalette" text="&amp;Save Palette" />
</menu>
<menu text="Selec&amp;t">
<item command="MaskAll" text="&amp;All" />
<item command="DeselectMask" text="&amp;Deselect" />
@ -729,6 +721,15 @@
<item command="RemoveFrameTag" text="&amp;Remove Tag" />
</menu>
<menu id="palette_popup">
<item command="PaletteEditor" text="&amp;Palette Editor">
<param name="switch" value="true" />
</item>
<separator />
<item command="LoadPalette" text="&amp;Load Palette" />
<item command="SavePalette" text="&amp;Save Palette" />
</menu>
</menus>
<!-- tools -->

BIN
data/skins/default/sheet.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

3
data/skins/default/skin.xml
View File

@ -267,7 +267,8 @@
<part id="ani_last" x="184" y="192" w="5" h="5" />
<part id="pal_edit" x="144" y="200" w="5" h="5" />
<part id="pal_sort" x="152" y="200" w="5" h="5" />
<part id="pal_options" x="160" y="200" w="5" h="5" />
<part id="pal_presets" x="160" y="200" w="5" h="5" />
<part id="pal_options" x="168" y="200" w="5" h="5" />
<part id="target_one" x="144" y="224" w="32" h="16" />
<part id="target_one_selected" x="144" y="240" w="32" h="16" />
<part id="target_frames" x="176" y="224" w="32" h="16" />

1
src/app/app_menus.cpp
View File

@ -88,6 +88,7 @@ void AppMenus::reload()
m_celPopupMenu.reset(loadMenuById(handle, "cel_popup"));
m_celMovementPopupMenu.reset(loadMenuById(handle, "cel_movement_popup"));
m_frameTagPopupMenu.reset(loadMenuById(handle, "frame_tag_popup"));
m_palettePopupMenu.reset(loadMenuById(handle, "palette_popup"));
////////////////////////////////////////
// Load keyboard shortcuts for commands

2
src/app/app_menus.h
View File

@ -46,6 +46,7 @@ namespace app {
Menu* getCelPopupMenu() { return m_celPopupMenu; }
Menu* getCelMovementPopupMenu() { return m_celMovementPopupMenu; }
Menu* getFrameTagPopupMenu() { return m_frameTagPopupMenu; }
Menu* getPalettePopupMenu() { return m_palettePopupMenu; }
void applyShortcutToMenuitemsWithCommand(Command* command, const Params& params, Key* key);
@ -65,6 +66,7 @@ namespace app {
base::UniquePtr<Menu> m_celPopupMenu;
base::UniquePtr<Menu> m_celMovementPopupMenu;
base::UniquePtr<Menu> m_frameTagPopupMenu;
base::UniquePtr<Menu> m_palettePopupMenu;
ScopedConnection m_recentFilesConn;
};

15
src/app/ui/color_bar.cpp
View File

@ -12,6 +12,7 @@
#include "app/ui/color_bar.h"
#include "app/app.h"
#include "app/app_menus.h"
#include "app/cmd/remap_colors.h"
#include "app/cmd/set_palette.h"
#include "app/color.h"
@ -49,6 +50,7 @@ namespace app {
enum class PalButton {
EDIT,
SORT,
PRESETS,
OPTIONS,
MAX
};
@ -162,6 +164,7 @@ ColorBar::ColorBar(int align)
m_buttons.addItem(theme->get_part(PART_PAL_EDIT));
m_buttons.addItem(theme->get_part(PART_PAL_SORT));
m_buttons.addItem(theme->get_part(PART_PAL_PRESETS));
m_buttons.addItem(theme->get_part(PART_PAL_OPTIONS));
onColorButtonChange(getFgColor());
@ -277,7 +280,7 @@ void ColorBar::onPaletteButtonClick()
break;
}
case PalButton::OPTIONS: {
case PalButton::PRESETS: {
if (!m_palettePopup.isVisible()) {
gfx::Rect bounds = m_buttons.getItem(item)->getBounds();
@ -291,6 +294,16 @@ void ColorBar::onPaletteButtonClick()
break;
}
case PalButton::OPTIONS: {
Menu* menu = AppMenus::instance()->getPalettePopupMenu();
if (menu) {
gfx::Rect bounds = m_buttons.getItem(item)->getBounds();
menu->showPopup(gfx::Point(bounds.x, bounds.y+bounds.h));
}
break;
}
}
}

1
src/app/ui/skin/skin_parts.h
View File

@ -123,6 +123,7 @@ namespace app {
PART_PAL_EDIT,
PART_PAL_SORT,
PART_PAL_PRESETS,
PART_PAL_OPTIONS,
PART_TARGET_ONE,

1
src/app/ui/skin/skin_theme.cpp
View File

@ -232,6 +232,7 @@ SkinTheme::SkinTheme()
sheet_mapping["ani_last"] = PART_ANI_LAST;
sheet_mapping["pal_edit"] = PART_PAL_EDIT;
sheet_mapping["pal_sort"] = PART_PAL_SORT;
sheet_mapping["pal_presets"] = PART_PAL_PRESETS;
sheet_mapping["pal_options"] = PART_PAL_OPTIONS;
sheet_mapping["target_one"] = PART_TARGET_ONE;
sheet_mapping["target_one_selected"] = PART_TARGET_ONE_SELECTED;