mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-05 00:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make PopupWindow movable again (fix regression from 1f25579f5a9923dc844f75d8e37ede83e148889f)

Browse Source
This commit is contained in:
David Capello 2015-01-19 20:44:47 -03:00
parent 4358989633
commit 9af8567a6b
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ui/popup_window.cpp
View File

@ -187,6 +187,23 @@ void PopupWindow::onInitTheme(InitThemeEvent& ev)
this->border_width.b = 3 * jguiscale(); 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() void PopupWindow::startFilteringMessages()
{ {
if (!m_filtering) { if (!m_filtering) {

1
src/ui/popup_window.h
View File

@ -34,6 +34,7 @@ namespace ui {
void onPreferredSize(PreferredSizeEvent& ev) override; void onPreferredSize(PreferredSizeEvent& ev) override;
void onPaint(PaintEvent& ev) override; void onPaint(PaintEvent& ev) override;
void onInitTheme(InitThemeEvent& ev) override; void onInitTheme(InitThemeEvent& ev) override;
void onHitTest(HitTestEvent& ev) override;
private: private:
void startFilteringMessages(); void startFilteringMessages();