[aseprite] 58/308: Rename PopupWindow enums
Tobias Hansen
thansen at moszumanska.debian.org
Tue Mar 8 02:44:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository aseprite.
commit d467d71fa5fcbefc91afb310364236b3270383b0
Author: David Capello <davidcapello at gmail.com>
Date: Sat Dec 5 15:56:32 2015 -0300
Rename PopupWindow enums
---
src/app/ui/brush_popup.cpp | 2 +-
src/app/ui/color_selector.cpp | 2 +-
src/app/ui/configure_timeline_popup.cpp | 2 +-
src/app/ui/font_popup.cpp | 4 ++--
src/app/ui/palette_popup.cpp | 2 +-
src/app/ui/status_bar.cpp | 2 +-
src/app/ui/toolbar.cpp | 2 +-
src/ui/int_entry.cpp | 2 +-
src/ui/popup_window.cpp | 6 +++---
src/ui/popup_window.h | 19 +++++++++----------
src/ui/tooltips.cpp | 2 +-
11 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/app/ui/brush_popup.cpp b/src/app/ui/brush_popup.cpp
index bbcea69..238f060 100644
--- a/src/app/ui/brush_popup.cpp
+++ b/src/app/ui/brush_popup.cpp
@@ -112,7 +112,7 @@ private:
static BrushRef defBrushes[3];
BrushPopup::BrushPopup(BrushPopupDelegate* delegate)
- : PopupWindow("", kCloseOnClickInOtherWindow)
+ : PopupWindow("", ClickBehavior::CloseOnClickInOtherWindow)
, m_delegate(delegate)
{
setAutoRemap(false);
diff --git a/src/app/ui/color_selector.cpp b/src/app/ui/color_selector.cpp
index d7640ef..a81ac75 100644
--- a/src/app/ui/color_selector.cpp
+++ b/src/app/ui/color_selector.cpp
@@ -50,7 +50,7 @@ enum {
};
ColorSelector::ColorSelector()
- : PopupWindowPin("Color Selector", PopupWindow::kCloseOnClickInOtherWindow)
+ : PopupWindowPin("Color Selector", ClickBehavior::CloseOnClickInOtherWindow)
, m_vbox(VERTICAL)
, m_topBox(HORIZONTAL)
, m_color(app::Color::fromMask())
diff --git a/src/app/ui/configure_timeline_popup.cpp b/src/app/ui/configure_timeline_popup.cpp
index ea8da3b..f83636f 100644
--- a/src/app/ui/configure_timeline_popup.cpp
+++ b/src/app/ui/configure_timeline_popup.cpp
@@ -38,7 +38,7 @@ namespace app {
using namespace ui;
ConfigureTimelinePopup::ConfigureTimelinePopup()
- : PopupWindow("Timeline Settings", kCloseOnClickInOtherWindow)
+ : PopupWindow("Timeline Settings", ClickBehavior::CloseOnClickInOtherWindow)
, m_lockUpdates(false)
{
setAutoRemap(false);
diff --git a/src/app/ui/font_popup.cpp b/src/app/ui/font_popup.cpp
index 4cee79e..e841d07 100644
--- a/src/app/ui/font_popup.cpp
+++ b/src/app/ui/font_popup.cpp
@@ -130,8 +130,8 @@ private:
FontPopup::FontPopup()
: PopupWindow("Fonts",
- kCloseOnClickInOtherWindow,
- kDoNothingOnEnter)
+ ClickBehavior::CloseOnClickInOtherWindow,
+ EnterBehavior::DoNothingOnEnter)
, m_popup(new gen::FontPopup())
{
setAutoRemap(false);
diff --git a/src/app/ui/palette_popup.cpp b/src/app/ui/palette_popup.cpp
index 0e52837..4119017 100644
--- a/src/app/ui/palette_popup.cpp
+++ b/src/app/ui/palette_popup.cpp
@@ -30,7 +30,7 @@ namespace app {
using namespace ui;
PalettePopup::PalettePopup()
- : PopupWindow("Palettes", kCloseOnClickInOtherWindow)
+ : PopupWindow("Palettes", ClickBehavior::CloseOnClickInOtherWindow)
, m_popup(new gen::PalettePopup())
{
setAutoRemap(false);
diff --git a/src/app/ui/status_bar.cpp b/src/app/ui/status_bar.cpp
index d5ba823..03921d4 100644
--- a/src/app/ui/status_bar.cpp
+++ b/src/app/ui/status_bar.cpp
@@ -88,7 +88,7 @@ private:
class StatusBar::SnapToGridWindow : public ui::PopupWindow {
public:
SnapToGridWindow()
- : ui::PopupWindow("", kDoNothingOnClick)
+ : ui::PopupWindow("", ClickBehavior::DoNothingOnClick)
, m_button("Disable Snap to Grid") {
setBorder(gfx::Border(2 * guiscale()));
setBgColor(gfx::rgba(255, 255, 200));
diff --git a/src/app/ui/toolbar.cpp b/src/app/ui/toolbar.cpp
index 6089fae..2000f5d 100644
--- a/src/app/ui/toolbar.cpp
+++ b/src/app/ui/toolbar.cpp
@@ -395,7 +395,7 @@ void ToolBar::openPopupWindow(int group_index, ToolGroup* tool_group)
return;
// In case this tool contains more than just one tool, show the popup window
- m_popupWindow = new PopupWindow("", PopupWindow::kCloseOnClickOutsideHotRegion);
+ m_popupWindow = new PopupWindow("", PopupWindow::ClickBehavior::CloseOnClickOutsideHotRegion);
m_closeConn = m_popupWindow->Close.connect(base::Bind<void, ToolBar, ToolBar>(&ToolBar::onClosePopup, this));
m_openedRecently = true;
diff --git a/src/ui/int_entry.cpp b/src/ui/int_entry.cpp
index 1c705e7..a43b8f7 100644
--- a/src/ui/int_entry.cpp
+++ b/src/ui/int_entry.cpp
@@ -169,7 +169,7 @@ void IntEntry::openPopup()
if (rc.x+rc.w > ui::display_w())
rc.x = rc.x - rc.w + bounds().w;
- m_popupWindow = new PopupWindow("", PopupWindow::kCloseOnClickInOtherWindow);
+ m_popupWindow = new PopupWindow("", PopupWindow::ClickBehavior::CloseOnClickInOtherWindow);
m_popupWindow->setAutoRemap(false);
m_popupWindow->setTransparent(true);
m_popupWindow->setBgColor(gfx::ColorNone);
diff --git a/src/ui/popup_window.cpp b/src/ui/popup_window.cpp
index afa90cb..8f5025d 100644
--- a/src/ui/popup_window.cpp
+++ b/src/ui/popup_window.cpp
@@ -97,7 +97,7 @@ bool PopupWindow::onProcessMessage(Message* msg)
if (scancode == kKeyEsc)
closeWindow(nullptr);
- if (m_enterBehavior == kCloseOnEnter &&
+ if (m_enterBehavior == EnterBehavior::CloseOnEnter &&
(scancode == kKeyEnter ||
scancode == kKeyEnterPad)) {
closeWindow(this);
@@ -114,7 +114,7 @@ bool PopupWindow::onProcessMessage(Message* msg)
// If the user click outside the window, we have to close
// the tooltip window.
- case kCloseOnClickInOtherWindow: {
+ case ClickBehavior::CloseOnClickInOtherWindow: {
Widget* picked = pick(mousePos);
if (!picked || picked->window() != this) {
closeWindow(NULL);
@@ -122,7 +122,7 @@ bool PopupWindow::onProcessMessage(Message* msg)
break;
}
- case kCloseOnClickOutsideHotRegion:
+ case ClickBehavior::CloseOnClickOutsideHotRegion:
if (!m_hotRegion.contains(mousePos)) {
closeWindow(NULL);
}
diff --git a/src/ui/popup_window.h b/src/ui/popup_window.h
index e1cf2c7..390719f 100644
--- a/src/ui/popup_window.h
+++ b/src/ui/popup_window.h
@@ -12,23 +12,22 @@
namespace ui {
- class PopupWindow : public Window
- {
+ class PopupWindow : public Window {
public:
- enum ClickBehavior {
- kDoNothingOnClick,
- kCloseOnClickInOtherWindow,
- kCloseOnClickOutsideHotRegion
+ enum class ClickBehavior {
+ DoNothingOnClick,
+ CloseOnClickInOtherWindow,
+ CloseOnClickOutsideHotRegion
};
- enum EnterBehavior {
- kDoNothingOnEnter,
- kCloseOnEnter,
+ enum class EnterBehavior {
+ DoNothingOnEnter,
+ CloseOnEnter,
};
PopupWindow(const std::string& text,
ClickBehavior clickBehavior,
- EnterBehavior enterBehavior = kCloseOnEnter);
+ EnterBehavior enterBehavior = EnterBehavior::CloseOnEnter);
~PopupWindow();
void setHotRegion(const gfx::Region& region);
diff --git a/src/ui/tooltips.cpp b/src/ui/tooltips.cpp
index 3a17ec9..aabde35 100644
--- a/src/ui/tooltips.cpp
+++ b/src/ui/tooltips.cpp
@@ -187,7 +187,7 @@ void TooltipManager::onTick()
// TipWindow
TipWindow::TipWindow(const std::string& text, const gfx::Rect& target)
- : PopupWindow(text, kCloseOnClickInOtherWindow)
+ : PopupWindow(text, ClickBehavior::CloseOnClickInOtherWindow)
, m_arrowAlign(0)
, m_target(target)
, m_closeOnKeyDown(true)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git
More information about the Pkg-games-commits
mailing list