[aseprite] 107/134: Make PopupWindow movable again (fix regression from 1f25579f5a9923dc844f75d8e37ede83e148889f)
Tobias Hansen
thansen at moszumanska.debian.org
Sat Mar 14 17:10:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository aseprite.
commit 9af8567a6b76cdccd4d34868ee4eef46b4b569b8
Author: David Capello <davidcapello at gmail.com>
Date: Mon Jan 19 20:44:47 2015 -0300
Make PopupWindow movable again (fix regression from 1f25579f5a9923dc844f75d8e37ede83e148889f)
---
src/ui/popup_window.cpp | 17 +++++++++++++++++
src/ui/popup_window.h | 1 +
2 files changed, 18 insertions(+)
diff --git a/src/ui/popup_window.cpp b/src/ui/popup_window.cpp
index 114f324..50f0a16 100644
--- a/src/ui/popup_window.cpp
+++ b/src/ui/popup_window.cpp
@@ -187,6 +187,23 @@ void PopupWindow::onInitTheme(InitThemeEvent& ev)
this->border_width.b = 3 * jguiscale();
}
+void PopupWindow::onHitTest(HitTestEvent& ev)
+{
+ Widget* picked = getManager()->pick(ev.getPoint());
+ if (picked) {
+ WidgetType type = picked->getType();
+ if ((type == kWindowWidget && picked == this) ||
+ type == kBoxWidget ||
+ type == kLabelWidget ||
+ type == kGridWidget ||
+ type == kSeparatorWidget) {
+ ev.setHit(HitTestCaption);
+ return;
+ }
+ }
+ Window::onHitTest(ev);
+}
+
void PopupWindow::startFilteringMessages()
{
if (!m_filtering) {
diff --git a/src/ui/popup_window.h b/src/ui/popup_window.h
index 4bf1394..ee0a5d2 100644
--- a/src/ui/popup_window.h
+++ b/src/ui/popup_window.h
@@ -34,6 +34,7 @@ namespace ui {
void onPreferredSize(PreferredSizeEvent& ev) override;
void onPaint(PaintEvent& ev) override;
void onInitTheme(InitThemeEvent& ev) override;
+ void onHitTest(HitTestEvent& ev) override;
private:
void startFilteringMessages();
--
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