Add context menu into windows.

2 files changed, 17 insertions, 2 deletions

diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 8d457e599..4f8bc88b3 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -641,6 +641,7 @@ void Window::setStickyButton(const bool flag)
 void Window::setSticky(const bool sticky)
 {
     mSticky = sticky;
+    mRedraw = true;
 }
 
 void Window::setStickyButtonLock(const bool lock)
@@ -704,6 +705,9 @@ void Window::scheduleDelete()
 
 void Window::mousePressed(MouseEvent &event)
 {
+    if (event.isConsumed())
+        return;
+
     if (event.getSource() == this)
     {
         if (getParent())
@@ -714,7 +718,8 @@ void Window::mousePressed(MouseEvent &event)
         mMoved = event.getY() <= static_cast<int>(mTitleBarHeight);
     }
 
-    if (event.getButton() == MouseEvent::LEFT)
+    const unsigned int button = event.getButton();
+    if (button == MouseEvent::LEFT)
     {
         const int x = event.getX();
         const int y = event.getY();
@@ -735,7 +740,6 @@ void Window::mousePressed(MouseEvent &event)
             setSticky(!isSticky());
             mouseResize = 0;
             mMoved = 0;
-            mRedraw = true;
             event.consume();
             return;
         }
@@ -749,6 +753,14 @@ void Window::mousePressed(MouseEvent &event)
         else
             mMoved = false;
     }
+    else if (button == MouseEvent::RIGHT)
+    {
+        if (viewport)
+        {
+            event.consume();
+            viewport->showWindowPopup(this);
+        }
+    }
 }
 
 void Window::close()
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 2c4ee5e5f..dfd1f63b7 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -170,6 +170,9 @@ class Window : public BasicContainer2,
          */
         void setCloseButton(const bool flag);
 
+        bool getCloseButton() const A_WARN_UNUSED
+        { return mCloseWindowButton; }
+
         /**
          * Returns whether the window can be resized.
          */