diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-03-10 10:33:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-10 10:41:38 +0000 |
| commit | 51d1fca2041ba4478c5abae59b1ed4fee37ea1ee (patch) | |
| tree | eccae16d5e06a8c05d4cc7ddf1951ac90246dc52 /vcl/source/window/brdwin.cxx | |
| parent | 6802f760a69f3b1f203d70399f0d73764f9159d5 (diff) | |
Related: tdf#98419 gtk3: reimplement passing window move control to wm...
for wayland
Dragging toolbars around to move them (starting with an undocked toolbar, not
the moving outline fake thing) doesn't work under wayland (as far as I can see)
without using gtk_window_begin_move_drag i.e. gtk_window_move doesn't work.
But this is supposed to be used from the initial mouse click (while it works
under wayland from a move, it doesn't work under X from a move) so rework the
last attempt to occur right at the initial click to drag.
Change-Id: I612f188b3e8482307bc816f5aa775530e6092eda
Diffstat (limited to 'vcl/source/window/brdwin.cxx')
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index dc925985ab84..da14e99ec75f 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -925,7 +925,10 @@ bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt ) maFrameData.mbDragFull = false; if ( nDragFullTest != DragFullOptions::NONE ) maFrameData.mbDragFull = true; // always fulldrag for proper docking, ignore system settings - pBorderWindow->StartTracking(); + StartTrackingFlags eFlags = maFrameData.mbDragFull ? + StartTrackingFlags::UseToolKitDrag : + StartTrackingFlags::NONE; + pBorderWindow->StartTracking(eFlags); } else if ( bHitTest ) maFrameData.mnHitTest = 0; @@ -1242,7 +1245,7 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) aPos.Y() += aMousePos.Y(); if ( maFrameData.mbDragFull ) { - pBorderWindow->MoveToByDrag(aPos); + pBorderWindow->SetPosPixel( aPos ); pBorderWindow->ImplUpdateAll(); pBorderWindow->ImplGetFrameWindow()->ImplUpdateAll(); } @@ -2203,11 +2206,6 @@ Rectangle ImplBorderWindow::GetMenuRect() const return mpBorderView->GetMenuRect(); } -void ImplBorderWindow::MoveToByDrag(const Point& rNewPos) -{ - setPosSizePixel(rNewPos.X(), rNewPos.Y(), 0, 0, PosSizeFlags::Pos | PosSizeFlags::ByDrag); -} - Size ImplBorderWindow::GetOptimalSize() const { const vcl::Window* pClientWindow = ImplGetClientWindow(); |