|
 |
f325b2 |
From 0f58534c4c3825f569a01774b7f8bb1808b37886 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
f325b2 |
Date: Tue, 15 Dec 2015 14:24:35 +0000
|
|
|
f325b2 |
Subject: [PATCH] gtk3+wayland: enable manual movement of toolbars
|
|
|
f325b2 |
|
|
|
f325b2 |
via gtk_window_begin_move_drag so add some BYDRAG/ByDrag hints
|
|
|
f325b2 |
to select mechanism to move window by
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Icc58653dff752a6d4ee49446647d7ede2af9dd9b
|
|
|
f325b2 |
---
|
|
|
f325b2 |
include/vcl/window.hxx | 3 ++-
|
|
|
f325b2 |
vcl/inc/brdwin.hxx | 2 ++
|
|
|
f325b2 |
vcl/inc/salframe.hxx | 1 +
|
|
|
f325b2 |
vcl/inc/unx/gtk/gtkframe.hxx | 5 ++++-
|
|
|
f325b2 |
vcl/source/window/brdwin.cxx | 7 ++++++-
|
|
|
f325b2 |
vcl/source/window/window.cxx | 2 ++
|
|
|
f325b2 |
vcl/unx/gtk3/gtk3gtkframe.cxx | 13 ++++++++++++-
|
|
|
f325b2 |
7 files changed, 29 insertions(+), 4 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
|
|
|
f325b2 |
index ae28940..1f5c0c2 100644
|
|
|
f325b2 |
--- a/include/vcl/window.hxx
|
|
|
f325b2 |
+++ b/include/vcl/window.hxx
|
|
|
f325b2 |
@@ -161,10 +161,11 @@ enum class PosSizeFlags
|
|
|
f325b2 |
PosSize = Pos | Size,
|
|
|
f325b2 |
All = PosSize,
|
|
|
f325b2 |
Dropdown = 0x0010,
|
|
|
f325b2 |
+ ByDrag = 0x0020,
|
|
|
f325b2 |
};
|
|
|
f325b2 |
namespace o3tl
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- template<> struct typed_flags<PosSizeFlags> : is_typed_flags<PosSizeFlags, 0x001f> {};
|
|
|
f325b2 |
+ template<> struct typed_flags<PosSizeFlags> : is_typed_flags<PosSizeFlags, 0x003f> {};
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
// Flags for Show()
|
|
|
f325b2 |
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
|
|
|
f325b2 |
index d00ca1b..7e89064 100644
|
|
|
f325b2 |
--- a/vcl/inc/brdwin.hxx
|
|
|
f325b2 |
+++ b/vcl/inc/brdwin.hxx
|
|
|
f325b2 |
@@ -170,6 +170,8 @@ public:
|
|
|
f325b2 |
|
|
|
f325b2 |
Rectangle GetMenuRect() const;
|
|
|
f325b2 |
|
|
|
f325b2 |
+ void MoveToByDrag(const Point& rNewPos);
|
|
|
f325b2 |
+
|
|
|
f325b2 |
virtual Size GetOptimalSize() const SAL_OVERRIDE;
|
|
|
f325b2 |
};
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
|
|
|
f325b2 |
index cfd401d..9b3d52e 100644
|
|
|
f325b2 |
--- a/vcl/inc/salframe.hxx
|
|
|
f325b2 |
+++ b/vcl/inc/salframe.hxx
|
|
|
f325b2 |
@@ -94,6 +94,7 @@ typedef sal_uInt64 SalExtStyle;
|
|
|
f325b2 |
#define SAL_FRAME_POSSIZE_Y ((sal_uInt16)0x0002)
|
|
|
f325b2 |
#define SAL_FRAME_POSSIZE_WIDTH ((sal_uInt16)0x0004)
|
|
|
f325b2 |
#define SAL_FRAME_POSSIZE_HEIGHT ((sal_uInt16)0x0008)
|
|
|
f325b2 |
+#define SAL_FRAME_POSSIZE_BYDRAG ((sal_uInt16)0x0010)
|
|
|
f325b2 |
|
|
|
f325b2 |
struct SystemParentData;
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
|
|
|
f325b2 |
index b779d39..a55ff2c 100644
|
|
|
f325b2 |
--- a/vcl/inc/unx/gtk/gtkframe.hxx
|
|
|
f325b2 |
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
|
|
|
f325b2 |
@@ -316,7 +316,10 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
|
|
|
f325b2 |
void widget_set_size_request(long nWidth, long nHeight);
|
|
|
f325b2 |
|
|
|
f325b2 |
void resizeWindow( long nWidth, long nHeight );
|
|
|
f325b2 |
- void moveWindow( long nX, long nY );
|
|
|
f325b2 |
+ void moveWindow(long nX, long nY);
|
|
|
f325b2 |
+#if GTK_CHECK_VERSION(3,0,0)
|
|
|
f325b2 |
+ void dragWindowTo(long nX, long nY);
|
|
|
f325b2 |
+#endif
|
|
|
f325b2 |
|
|
|
f325b2 |
Size calcDefaultSize();
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
|
|
|
f325b2 |
index 97dbc5b..f57ab37 100644
|
|
|
f325b2 |
--- a/vcl/source/window/brdwin.cxx
|
|
|
f325b2 |
+++ b/vcl/source/window/brdwin.cxx
|
|
|
f325b2 |
@@ -1243,7 +1243,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt )
|
|
|
f325b2 |
aPos.Y() += aMousePos.Y();
|
|
|
f325b2 |
if ( maFrameData.mbDragFull )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- pBorderWindow->SetPosPixel( aPos );
|
|
|
f325b2 |
+ pBorderWindow->MoveToByDrag(aPos);
|
|
|
f325b2 |
pBorderWindow->ImplUpdateAll();
|
|
|
f325b2 |
pBorderWindow->ImplGetFrameWindow()->ImplUpdateAll();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
@@ -2195,6 +2195,11 @@ Rectangle ImplBorderWindow::GetMenuRect() const
|
|
|
f325b2 |
return mpBorderView->GetMenuRect();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
+void ImplBorderWindow::MoveToByDrag(const Point& rNewPos)
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ setPosSizePixel(rNewPos.X(), rNewPos.Y(), 0, 0, PosSizeFlags::Pos | PosSizeFlags::ByDrag);
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
Size ImplBorderWindow::GetOptimalSize() const
|
|
|
f325b2 |
{
|
|
|
f325b2 |
const vcl::Window* pClientWindow = ImplGetClientWindow();
|
|
|
f325b2 |
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
|
|
|
f325b2 |
index 20377ac..808d683 100644
|
|
|
f325b2 |
--- a/vcl/source/window/window.cxx
|
|
|
f325b2 |
+++ b/vcl/source/window/window.cxx
|
|
|
f325b2 |
@@ -2886,6 +2886,8 @@ void Window::setPosSizePixel( long nX, long nY,
|
|
|
f325b2 |
nSysFlags |= SAL_FRAME_POSSIZE_WIDTH;
|
|
|
f325b2 |
if( nFlags & PosSizeFlags::Height )
|
|
|
f325b2 |
nSysFlags |= SAL_FRAME_POSSIZE_HEIGHT;
|
|
|
f325b2 |
+ if( nFlags & PosSizeFlags::ByDrag )
|
|
|
f325b2 |
+ nSysFlags |= SAL_FRAME_POSSIZE_BYDRAG;
|
|
|
f325b2 |
if( nFlags & PosSizeFlags::X )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
nSysFlags |= SAL_FRAME_POSSIZE_X;
|
|
|
f325b2 |
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
f325b2 |
index 7c24d2b..6a69c82 100644
|
|
|
f325b2 |
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
f325b2 |
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
f325b2 |
@@ -878,6 +878,14 @@ void GtkSalFrame::moveWindow( long nX, long nY )
|
|
|
f325b2 |
gtk_window_move( GTK_WINDOW(m_pWindow), nX, nY );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
+void GtkSalFrame::dragWindowTo(long nX, long nY)
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ if (isChild(false))
|
|
|
f325b2 |
+ moveWindow(nX, nY);
|
|
|
f325b2 |
+ else
|
|
|
f325b2 |
+ gtk_window_begin_move_drag(GTK_WINDOW(m_pWindow), 1, nX, nY, GDK_CURRENT_TIME);
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
void GtkSalFrame::widget_set_size_request(long nWidth, long nHeight)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
gtk_widget_set_size_request(GTK_WIDGET(m_pFixedContainer), nWidth, nHeight );
|
|
|
f325b2 |
@@ -1717,7 +1725,10 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u
|
|
|
f325b2 |
|
|
|
f325b2 |
m_bDefaultPos = false;
|
|
|
f325b2 |
|
|
|
f325b2 |
- moveWindow(nX, nY);
|
|
|
f325b2 |
+ if (nFlags & SAL_FRAME_POSSIZE_BYDRAG)
|
|
|
f325b2 |
+ dragWindowTo(nX, nY);
|
|
|
f325b2 |
+ else
|
|
|
f325b2 |
+ moveWindow(nX, nY);
|
|
|
f325b2 |
|
|
|
f325b2 |
updateScreenNumber();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.5.0
|
|
|
f325b2 |
|