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

Don't create PalettePopup when the program starts

Browse Source
This commit is contained in:
David Capello 2015-05-20 16:51:32 -03:00
parent e730b90958
commit ca16580b09
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@
#include "app/ui/color_spectrum.h" #include "app/ui/color_spectrum.h"
#include "app/ui/editor/editor.h" #include "app/ui/editor/editor.h"
#include "app/ui/input_chain.h" #include "app/ui/input_chain.h"
#include "app/ui/palette_popup.h"
#include "app/ui/skin/skin_theme.h" #include "app/ui/skin/skin_theme.h"
#include "app/ui/status_bar.h" #include "app/ui/status_bar.h"
#include "app/ui_context.h" #include "app/ui_context.h"
@ -322,15 +323,18 @@ void ColorBar::onPaletteButtonClick()
} }
case PalButton::PRESETS: { case PalButton::PRESETS: {
if (!m_palettePopup.isVisible()) { if (!m_palettePopup)
m_palettePopup.reset(new PalettePopup());
if (!m_palettePopup->isVisible()) {
gfx::Rect bounds = m_buttons.getItem(item)->getBounds(); gfx::Rect bounds = m_buttons.getItem(item)->getBounds();
m_palettePopup.showPopup( m_palettePopup->showPopup(
gfx::Rect(bounds.x, bounds.y+bounds.h, gfx::Rect(bounds.x, bounds.y+bounds.h,
ui::display_w()/2, ui::display_h()/2)); ui::display_w()/2, ui::display_h()/2));
} }
else { else {
m_palettePopup.closeWindow(NULL); m_palettePopup->closeWindow(NULL);
} }
break; break;
} }

6
src/app/ui/color_bar.h
View File

@ -13,7 +13,6 @@
#include "app/ui/button_set.h" #include "app/ui/button_set.h"
#include "app/ui/color_button.h" #include "app/ui/color_button.h"
#include "app/ui/input_chain_element.h" #include "app/ui/input_chain_element.h"
#include "app/ui/palette_popup.h"
#include "app/ui/palette_view.h" #include "app/ui/palette_view.h"
#include "base/connection.h" #include "base/connection.h"
#include "base/signal.h" #include "base/signal.h"
@ -28,8 +27,9 @@
namespace app { namespace app {
class ColorButton; class ColorButton;
class Command; class Command;
class PalettesLoader;
class PaletteIndexChangeEvent; class PaletteIndexChangeEvent;
class PalettePopup;
class PalettesLoader;
class ColorBar : public ui::Box class ColorBar : public ui::Box
, public PaletteViewDelegate , public PaletteViewDelegate
@ -106,7 +106,7 @@ namespace app {
}; };
ButtonSet m_buttons; ButtonSet m_buttons;
PalettePopup m_palettePopup; base::UniquePtr<PalettePopup> m_palettePopup;
ScrollableView m_scrollableView; ScrollableView m_scrollableView;
PaletteView m_paletteView; PaletteView m_paletteView;
ui::Button m_remapButton; ui::Button m_remapButton;