summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-11-01 20:32:57 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-11-02 14:04:18 +0000
commitb99bff93a3dd2f76c9c98ff3bc72a60cbd79730a (patch)
tree85206efb4a026a0b4f8ff4fb6fa047ccd7b35222
parent38e7f38b82e121120739034b4119e7d95c8b33fd (diff)
gtk3: allow float grab inside float grab
this is so that the floating window belonging to the listbox inside the floating window color popup will track the mouse as it moves up and down over the menu. Change-Id: If108b5b3866fdbc04513c48c8d859bedd3867379
-rw-r--r--vcl/unx/gtk3/gtk3gtkframe.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 704e4ce83c8e..60e1a1d8bbab 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1438,7 +1438,7 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ )
SetDefaultSize();
setMinMaxSize();
- if (isFloatGrabWindow() && !getDisplay()->GetCaptureFrame() && m_nFloats == 0)
+ if (isFloatGrabWindow() && !getDisplay()->GetCaptureFrame())
{
m_pParent->grabPointer(true, true);
gtk_grab_add(m_pParent->getMouseEventWidget());
@@ -1449,7 +1449,7 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ )
if( isFloatGrabWindow() )
{
m_nFloats++;
- if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 1 )
+ if (!getDisplay()->GetCaptureFrame())
{
grabPointer(true, true);
gtk_grab_add(getMouseEventWidget());
@@ -1464,7 +1464,7 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ )
if( isFloatGrabWindow() )
{
m_nFloats--;
- if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 0)
+ if (!getDisplay()->GetCaptureFrame())
{
gtk_grab_remove(getMouseEventWidget());
grabPointer(false);