diff options
author | Thomas Lübking <thomas.luebking@gmail.com> | 2016-09-11 20:06:25 (GMT) |
---|---|---|
committer | Thomas Lübking <thomas.luebking@gmail.com> | 2016-09-11 20:07:01 (GMT) |
commit | 0c13ddc0c85ed4445ff8e289387c142e0ac98c77 (patch) | |
tree | 0b35e4a7b340382034d74c71c608ebc65851c928 /src | |
parent | 7ec5c581c1a3a01fa4578ee97ea8e4b1ea9747f2 (diff) | |
download | fluxbox-0c13ddc0c85ed4445ff8e289387c142e0ac98c77.zip fluxbox-0c13ddc0c85ed4445ff8e289387c142e0ac98c77.tar.bz2 |
resolve handle/grip context conflict
Diffstat (limited to 'src')
-rw-r--r-- | src/FbWinFrame.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc index 2454141..012b359 100644 --- a/src/FbWinFrame.cc +++ b/src/FbWinFrame.cc | |||
@@ -1589,7 +1589,12 @@ int FbWinFrame::getContext(Window win, int x, int y, int last_x, int last_y, boo | |||
1589 | if (window().window() == win) return context | Keys::ON_WINDOW; | 1589 | if (window().window() == win) return context | Keys::ON_WINDOW; |
1590 | // /!\ old code: handle = titlebar in motionNotifyEvent but only there ! | 1590 | // /!\ old code: handle = titlebar in motionNotifyEvent but only there ! |
1591 | // handle() as border ?? | 1591 | // handle() as border ?? |
1592 | if (handle().window() == win) return Keys::ON_WINDOWBORDER | Keys::ON_WINDOW; | 1592 | if (handle().window() == win) { |
1593 | const int px = x - this->x() - window().borderWidth(); | ||
1594 | if (px < gripLeft().x() + gripLeft().width() || px > gripRight().x()) | ||
1595 | return context; // one of the corners | ||
1596 | return Keys::ON_WINDOWBORDER | Keys::ON_WINDOW; | ||
1597 | } | ||
1593 | if (titlebar().window() == win) { | 1598 | if (titlebar().window() == win) { |
1594 | const int px = x - this->x() - window().borderWidth(); | 1599 | const int px = x - this->x() - window().borderWidth(); |
1595 | if (px < label().x() || px > label().x() + label().width()) | 1600 | if (px < label().x() || px > label().x() + label().width()) |