[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/uibase/docvw/edtwin.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 668606a384c35ce43b4c73645d80518333c86b67 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Apr 9 09:56:48 2015 +0200 SwEditWin tiled rendering: do word selection even if the cursor was corrected When tiled rendering, we always want to create some kind of selection when long pushing on a table cell. If there is at least one word in the cell, then we want to select the nearest cell, and when it's empty, then we want to select the cell itself. In case there is a table with 1 rows and 2 columns, and A1 is empty, but A2 has multiple lines, then in A1 there is an area that's outside the text frame of the empty paragraph, but inside the A1 cell frame. When clicking on that area, the cursor position gets corrected. With this change, we get a proper selection on long push even when pushing on that outside text, inside cell area, too. Change-Id: Ic61743014708f127087243cb7b129f8abd72edaa diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index a05430a..42c41f3 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -3283,8 +3283,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt) } // if the cursor position was corrected or if a Fly -// was selected in ReadOnlyMode, no word selection. -if ( !g_bValidCrsrPos || rSh.IsFrmSelected() ) +// was selected in ReadOnlyMode, no word selection, except when tiled rendering. +if ((!g_bValidCrsrPos || rSh.IsFrmSelected()) !rSh.isTiledRendering()) return; SwField *pFld; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/core/view/viewsh.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 880228e7a99b95879a1e0d5315e6bd1401dffc20 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Apr 8 10:05:18 2015 +0200 SwViewShell::PaintTile: avoid incomplete tiles when layout is not ready The problem was that in SwViewShell::Paint(), in case CheckInvalidForPaint() returns true, we don't paint anything, but rely on invalidations to call Paint() again and hand out an incomplete tile. For tiled rendering, we want to hand out complete tiles all the time, so call CheckInvalidForPaint() early in SwViewShell::PaintTile() that will ensure that by the time SwViewShell::Paint() is called, the layout is ready for that tile. Without this, when opening any larger document with the Android viewer, about at least once out of 5 times an incomplete tile (e.g. almost totally white) was shown for the first page, and the user had to work around this by zooming out + in again to force a re-draw with valid layout. Change-Id: Ic7d3a6ddbf9f04beae9ecaa9563d3f5b4d22cc5c diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 4fdf00b..14dfb43 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1816,6 +1816,9 @@ void SwViewShell::PaintTile(VirtualDevice rDevice, int contextWidth, int contex // tiled rendering? VisPortChgd(SwRect(aOutRect)); +// Invoke SwLayAction if layout is not yet ready. +CheckInvalidForPaint(aOutRect); + // draw - works in logic coordinates Paint(aOutRect); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/core/crsr/viscrs.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 085ed0cfa7a831326d308c501db8a2d76a947016 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Apr 2 12:14:16 2015 +0200 SwSelPaintRects: avoid rendering the overlay on Android It's enough to emit the LOK callbacks, no need to waste resources with the drawinglayer overlay that would not be shown anyway. As a side-effect, this also fixes a crash on long push on empty table cells. Change-Id: I28e670d91bafcbfac93655a7d161f03670a54cfc diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 89962ec..11ef0f5 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -290,7 +290,7 @@ void SwSelPaintRects::Show() SwRects::clear(); FillRects(); -#if HAVE_FEATURE_DESKTOP || defined(ANDROID) +#if HAVE_FEATURE_DESKTOP // get new rects std::vector basegfx::B2DRange aNewRanges; @@ -338,6 +338,9 @@ void SwSelPaintRects::Show() } } +HighlightInputFld(); +#endif + // Tiled editing does not expose the draw and writer cursor, it just // talks about the cursor at the moment. As long as that's true, // don't say anything about the Writer cursor till a draw object is @@ -378,9 +381,6 @@ void SwSelPaintRects::Show() OString sRect = ss.str().c_str(); GetShell()-libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION, sRect.getStr()); } - -HighlightInputFld(); -#endif } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/uibase/uno/unotxdoc.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9cadcc1e4f0525953fbcfc2adeaa89ef0a90eb9e
Author: Tomaž Vajngerl tomaz.vajng...@collabora.co.uk
Date: Wed Mar 18 18:48:57 2015 +0900
setGraphicSelection should use LOK_SETGRAPHICSELECTION_*
Change-Id: I119940f89284a19594819fb26f93155a476f487c
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index e818ffe..e552404 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3232,10 +3232,10 @@ void SwXTextDocument::setGraphicSelection(int nType,
int nX, int nY)
SwEditWin rEditWin = pDocShell-GetView()-GetEditWin();
switch (nType)
{
-case LOK_SETTEXTSELECTION_START:
+case LOK_SETGRAPHICSELECTION_START:
rEditWin.SetGraphicLogicPosition(/*bStart=*/true, Point(nX, nY));
break;
-case LOK_SETTEXTSELECTION_END:
+case LOK_SETGRAPHICSELECTION_END:
rEditWin.SetGraphicLogicPosition(/*bStart=*/false, Point(nX, nY));
break;
default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/uibase/docvw/edtwin.cxx | 17 +
1 file changed, 17 insertions(+)
New commits:
commit 5f5b8c14d62aeedbf59d5758d4b78aafac63c134
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Mar 18 09:03:48 2015 +0100
sw tiled rendering: let single click start shape text editing
This affects only the text area of the shape, single click on the border
still just selects the shape.
Change-Id: Ia3564e6a95213773512e4c904843ff42aeb3a9ba
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 7e74b90..f6b4ffe 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -4887,6 +4887,23 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
if (bCallBase)
Window::MouseButtonUp(rMEvt);
+
+if (pSdrView rMEvt.GetClicks() == 1 rSh.isTiledRendering())
+{
+// When tiled rendering, single click on a shape text starts editing
already.
+SdrViewEvent aViewEvent;
+SdrHitKind eHit = pSdrView-PickAnything(rMEvt, SDRMOUSEBUTTONUP,
aViewEvent);
+const SdrMarkList rMarkList = pSdrView-GetMarkedObjectList();
+if (eHit == SDRHIT_TEXTEDITOBJ rMarkList.GetMarkCount() == 1)
+{
+if (SdrObject* pObj = rMarkList.GetMark(0)-GetMarkedSdrObj())
+{
+EnterDrawTextMode(pObj-GetLogicRect().Center());
+if (m_rView.GetCurShell()-ISA(SwDrawTextShell))
+
static_castSwDrawTextShell*(m_rView.GetCurShell())-Init();
+}
+}
+}
}
/**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/uibase/wrtsh/wrtsh2.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 7ef570780a4ebb07e128681a96c35d6268c5e658
Author: Siqi Liu m...@siqi.fr
Date: Mon Mar 9 12:51:54 2015 +0100
use toUtf8 instead for string conversion
Change-Id: I1ec96957fba161a35ec2cf44f197ed3d7199dd89
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 01fab7a..4b26692 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -472,10 +472,8 @@ void LoadURL( SwViewShell rVSh, const OUString rURL,
sal_uInt16 nFilter,
return;
// We are doing tiledRendering, let the client handles the URL loading.
-if (rVSh.isTiledRendering())
-{
-rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
-OUStringToOString(rURL, RTL_TEXTENCODING_UTF8).getStr());
+if (rVSh.isTiledRendering()) {
+rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
rURL.toUtf8().getStr());
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/uibase/wrtsh/wrtsh2.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 15f8e2b813ce9bc16cb4c87fe0490d112f2cb0c5
Author: Jan Holesovsky ke...@collabora.com
Date: Mon Mar 9 15:45:56 2015 +0100
Consistency ;-)
Change-Id: Ibb5ff11bc49d346c5435ffe7866a33148954f3c1
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 4b26692..fd37736 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -472,7 +472,8 @@ void LoadURL( SwViewShell rVSh, const OUString rURL,
sal_uInt16 nFilter,
return;
// We are doing tiledRendering, let the client handles the URL loading.
-if (rVSh.isTiledRendering()) {
+if (rVSh.isTiledRendering())
+{
rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
rURL.toUtf8().getStr());
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/uibase/wrtsh/wrtsh2.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 13fd2d6a4327f61a0bf5293f1b0400b9acb7693f
Author: Jan Holesovsky ke...@collabora.com
Date: Mon Mar 9 09:04:46 2015 +0100
Whitespace in a recent commit.
Change-Id: Ied315d27cd0b5dbe640a2a3c87f5dc6c3dc11bf0
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index a2bb960..01fab7a 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -472,7 +472,8 @@ void LoadURL( SwViewShell rVSh, const OUString rURL,
sal_uInt16 nFilter,
return;
// We are doing tiledRendering, let the client handles the URL loading.
-if (rVSh.isTiledRendering()) {
+if (rVSh.isTiledRendering())
+{
rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
OUStringToOString(rURL, RTL_TEXTENCODING_UTF8).getStr());
return;
@@ -481,7 +482,6 @@ void LoadURL( SwViewShell rVSh, const OUString rURL,
sal_uInt16 nFilter,
//A CrsrShell is always a WrtShell
SwWrtShell rSh = static_castSwWrtShell(rVSh);
-
SwDocShell* pDShell = rSh.GetView().GetDocShell();
OSL_ENSURE( pDShell, No DocShell?!);
OUString sTargetFrame(rTargetFrameName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/uibase/wrtsh/wrtsh2.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 8513f4f76ac1769533fe65a686fcd4eae739547b
Author: Siqi Liu m...@siqi.fr
Date: Sun Mar 8 23:11:16 2015 +0100
tdf#89705 hyperlink clickable in writer (not in impress, yet)
Change-Id: Ifaa6c0de7d9b91706985667b72195bcfc2d610cd
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx
b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 489aeba..a2bb960 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -66,6 +66,8 @@
#include xmloff/odffields.hxx
#include boost/scoped_ptr.hpp
+#include LibreOfficeKit/LibreOfficeKitEnums.h
+
void SwWrtShell::Insert(SwField rFld)
{
ResetCursorStack();
@@ -469,9 +471,17 @@ void LoadURL( SwViewShell rVSh, const OUString rURL,
sal_uInt16 nFilter,
if ( !rVSh.ISA(SwCrsrShell) )
return;
+// We are doing tiledRendering, let the client handles the URL loading.
+if (rVSh.isTiledRendering()) {
+rVSh.libreOfficeKitCallback(LOK_CALLBACK_HYPERLINK_CLICKED,
+OUStringToOString(rURL, RTL_TEXTENCODING_UTF8).getStr());
+return;
+}
+
//A CrsrShell is always a WrtShell
SwWrtShell rSh = static_castSwWrtShell(rVSh);
+
SwDocShell* pDShell = rSh.GetView().GetDocShell();
OSL_ENSURE( pDShell, No DocShell?!);
OUString sTargetFrame(rTargetFrameName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/core/view/viewsh.cxx| 16 +++-
sw/source/uibase/docvw/edtwin.cxx |6 --
sw/source/uibase/uno/unotxdoc.cxx |5 +
3 files changed, 16 insertions(+), 11 deletions(-)
New commits:
commit 297ec052aadb7dea7e4ee22c8d16da904329cb6e
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Mar 5 09:54:27 2015 +0100
sw: when tiled rendering, disable map mode of SwEditWin early
The problem was that the earlier SwEditWin: disable map mode in
LogicMouseButtonUp/Down commit disabled map mode only during the
handling of the mouse event, so in case a method invoked by the idle
timer used our logic coordinates later, it still performed the pixel -
logic conversion, leading to jumping cursor after a mouse click.
Fix this by disabling map mode early, even outside the mouse handlers.
Change-Id: Ib9f194f536a9af21a2d66bd7345addee72c3
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 0af292a..8cd439a 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1141,11 +1141,17 @@ void SwViewShell::VisPortChgd( const SwRect rRect)
}
}
-Point aPt( VisArea().Pos() );
-aPt.X() = -aPt.X(); aPt.Y() = -aPt.Y();
-MapMode aMapMode( GetWin()-GetMapMode() );
-aMapMode.SetOrigin( aPt );
-GetWin()-SetMapMode( aMapMode );
+// When tiled rendering, the map mode of the window is disabled, avoid
+// enabling it here.
+if (!isTiledRendering())
+{
+Point aPt( VisArea().Pos() );
+aPt.X() = -aPt.X(); aPt.Y() = -aPt.Y();
+MapMode aMapMode( GetWin()-GetMapMode() );
+aMapMode.SetOrigin( aPt );
+GetWin()-SetMapMode( aMapMode );
+}
+
if ( HasDrawView() )
{
Imp()-GetDrawView()-VisAreaChanged( GetWin() );
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 106c23a..6d409e6 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -6246,15 +6246,12 @@ void SwEditWin::LogicMouseButtonDown(const MouseEvent
rMouseEvent)
// When we're not doing tiled rendering, then positions must be passed as
pixels.
assert(m_rView.GetWrtShell().isTiledRendering());
-bool bMap = IsMapModeEnabled();
-EnableMapMode(false);
Point aPoint = GetPointerPosPixel();
SetLastMousePos(rMouseEvent.GetPosPixel());
MouseButtonDown(rMouseEvent);
SetPointerPosPixel(aPoint);
-EnableMapMode(bMap);
}
void SwEditWin::LogicMouseButtonUp(const MouseEvent rMouseEvent)
@@ -6262,15 +6259,12 @@ void SwEditWin::LogicMouseButtonUp(const MouseEvent
rMouseEvent)
// When we're not doing tiled rendering, then positions must be passed as
pixels.
assert(m_rView.GetWrtShell().isTiledRendering());
-bool bMap = IsMapModeEnabled();
-EnableMapMode(false);
Point aPoint = GetPointerPosPixel();
SetLastMousePos(rMouseEvent.GetPosPixel());
MouseButtonUp(rMouseEvent);
SetPointerPosPixel(aPoint);
-EnableMapMode(bMap);
}
void SwEditWin::SetCursorLogicPosition(const Point rPosition, bool bPoint,
bool bClearMark)
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 0f0cbeb..b96f82f 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3166,6 +3166,11 @@ void SwXTextDocument::initializeForTiledRendering()
if (!pView)
return;
pView-SetViewLayout(nColumns, bBookMode, true);
+
+// Disable map mode, so that it's possible to send mouse event coordinates
+// directly in twips.
+SwEditWin rEditWin = pDocShell-GetView()-GetEditWin();
+rEditWin.EnableMapMode(false);
}
void SwXTextDocument::registerCallback(LibreOfficeKitCallback pCallback, void*
pData)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/uibase/docvw/edtwin.cxx | 40 +-
1 file changed, 27 insertions(+), 13 deletions(-)
New commits:
commit 2e59b848cb956a365b1b1829a6e80609e46236e6
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Mar 3 12:09:04 2015 +0100
SwEditWin: disable map mode in LogicMouseButtonUp/Down
This partially reverts commit 3d4c1b9dcebaeefaf70dd9191f0573f050297d11
(Initial SwEditWin::LogicMouseButtonDown/Up, 2015-01-21), which tried to
catch all pixel - logic conversions in SwEditWin::MouseButtonDown().
The problem is that it doesn't really scale, we can't do the same for
drawinglayer as well.
Instead, simply disable the map mode in the Logic...() methods as we
already do in Impress, which doesn't have a single central
LogicMouseButtonDown/Up method, so there we had to use mapmode disabling
from day 0 for tiled editing.
Change-Id: I72be546400f5db10ac6d09a9bb10f7f0658942a5
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 08105b9..4a45b73 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2817,7 +2817,6 @@ void SwEditWin::MoveCursor( SwWrtShell rSh, const Point
aDocPos,
void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
{
SwWrtShell rSh = m_rView.GetWrtShell();
-bool bTiledRendering = rSh.isTiledRendering();
const SwField *pCrsrFld = rSh.CrsrInsideInputFld() ? rSh.GetCurFld( true )
: NULL;
// We have to check if a context menu is shown and we have an UI
@@ -2834,7 +2833,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
MouseEvent rMEvt(_rMEvt);
-if (!bTiledRendering m_rView.GetPostItMgr()-IsHit(rMEvt.GetPosPixel()))
+if (m_rView.GetPostItMgr()-IsHit(rMEvt.GetPosPixel()))
return;
m_rView.GetPostItMgr()-SetActiveSidebarWin(0);
@@ -2853,11 +2852,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
m_bWasShdwCrsr = 0 != m_pShadCrsr;
delete m_pShadCrsr, m_pShadCrsr = 0;
-Point aDocPos;
-if (bTiledRendering)
-aDocPos = rMEvt.GetPosPixel();
-else
-aDocPos = PixelToLogic( rMEvt.GetPosPixel() );
+const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
// How many clicks do we need to select a fly frame?
FrameControlType eControl;
@@ -2979,7 +2974,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
SET_CURR_SHELL( rSh );
SdrView *pSdrView = rSh.GetDrawView();
-if ( pSdrView !bTiledRendering)
+if ( pSdrView )
{
if (pSdrView-MouseButtonDown( rMEvt, this ) )
{
@@ -3028,7 +3023,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
m_rView.InvalidateRulerPos();
SfxBindings rBind = m_rView.GetViewFrame()-GetBindings();
rBind.Update();
-if ( !bTiledRendering RulerColumnDrag( rMEvt,
+if ( RulerColumnDrag( rMEvt,
(SwTab::COL_VERT == nMouseTabCol || SwTab::ROW_HORI ==
nMouseTabCol)) )
{
m_rView.SetTabColFromDoc( false );
@@ -3052,7 +3047,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
SfxBindings rBind = m_rView.GetViewFrame()-GetBindings();
rBind.Update();
-if ( !bTiledRendering RulerMarginDrag( rMEvt,
+if ( RulerMarginDrag( rMEvt,
rSh.IsVerticalModeAtNdAndPos( *pNodeAtPos, aDocPos ) )
)
{
m_rView.SetNumRuleNodeFromDoc( NULL );
@@ -3108,7 +3103,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
return;
}
}
-if ( !bTiledRendering EnterDrawMode( rMEvt, aDocPos ) )
+if ( EnterDrawMode( rMEvt, aDocPos ) )
{
bNoInterrupt = false;
return;
@@ -3183,7 +3178,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
SwEditWin::m_nDDStartPosX = aDocPos.X();
// hit an URL in DrawText object?
-if (bExecHyperlinks pSdrView !bTiledRendering)
+if (bExecHyperlinks pSdrView)
{
SdrViewEvent aVEvt;
pSdrView-PickAnything(rMEvt, SDRMOUSEBUTTONDOWN,
aVEvt);
@@ -3756,7 +3751,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
}
}
-if (bCallBase !bTiledRendering)
+if (bCallBase)
Window::MouseButtonDown(rMEvt);
}
@@ -6250,13 +6245,32 @@ void SwEditWin::LogicMouseButtonDown(const MouseEvent
rMouseEvent)
{
// When we're not doing tiled rendering, then positions must be passed as
pixels.
assert(m_rView.GetWrtShell().isTiledRendering());
+
+bool bMap = IsMapModeEnabled();
+EnableMapMode(false);
+Point aPoint = GetPointerPosPixel();
+
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/core/crsr/viscrs.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 59760d4a3cf0e9afaf4d6504fc07399283b239b4
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Mar 2 11:50:06 2015 +0100
SwShellTableCrsr::FillStartEnd: make sure that the rectangle's width is not 0
The shell (i.e. non-table) cursor does this already and this also fixes
the SwRect::SVRect() assertions firing during the drag of a table
selection handle.
Change-Id: Ia63844f5e2f6e107d47b7ed39af2a72bd433003e
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 1422f3d..c0b4a33 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -356,12 +356,12 @@ void SwSelPaintRects::Show()
SwRect aEndRect;
FillStartEnd(aStartRect, aEndRect);
-if (aStartRect.Height())
+if (aStartRect.HasArea())
{
OString sRect = aStartRect.SVRect().toString();
GetShell()-libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION_START,
sRect.getStr());
}
-if (aEndRect.Height())
+if (aEndRect.HasArea())
{
OString sRect = aEndRect.SVRect().toString();
GetShell()-libreOfficeKitCallback(LOK_CALLBACK_TEXT_SELECTION_END,
sRect.getStr());
@@ -759,7 +759,7 @@ void SwShellTableCrsr::FillRects()
if (bStart)
{
bStart = false;
-m_aStart = SwRect(pFrm-Frm().Left(), pFrm-Frm().Top(),
0, pFrm-Frm().Height());
+m_aStart = SwRect(pFrm-Frm().Left(), pFrm-Frm().Top(),
1, pFrm-Frm().Height());
}
}
@@ -768,7 +768,7 @@ void SwShellTableCrsr::FillRects()
}
}
if (pEndFrm)
-m_aEnd = SwRect(pEndFrm-Frm().Right(), pEndFrm-Frm().Top(), 0,
pEndFrm-Frm().Height());
+m_aEnd = SwRect(pEndFrm-Frm().Right(), pEndFrm-Frm().Top(), 1,
pEndFrm-Frm().Height());
aReg.Invert();
insert( begin(), aReg.begin(), aReg.end() );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/core/crsr/swcrsr.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit cd7c33e31fac9906d4246cdcb4de348348226685
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Mar 2 15:49:15 2015 +0100
SwCursor: when tiled rendering also select word before the point
On the desktop, the logic is that if we double-click before a word, then we
select the word, but if we double-click after it, then we don't.
When tiled rendering, it's more important to always select something, as
that's how the selection can be adjusted further. So if we long push
after a non-empty text node, then select its last word. This way
something is always selected if e.g. the user long pushes inside a table
cell. (If the table cell is empty, then that's handled in
SwCrsrShell::SelectCell().)
Change-Id: I6e84874b8cf252fc6b72a75ffe9db67b03636862
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index ff3ee93..94a7216 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1366,13 +1366,24 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell,
sal_Int16 nWordType, const
}
else
{
-const sal_Int32 nPtPos = GetPoint()-nContent.GetIndex();
+sal_Int32 nPtPos = GetPoint()-nContent.GetIndex();
Boundary aBndry( g_pBreakIt-GetBreakIter()-getWordBoundary(
pTxtNd-GetTxt(), nPtPos,
g_pBreakIt-GetLocale( pTxtNd-GetLang( nPtPos
) ),
nWordType,
bForward ));
+if (pViewShell-isTiledRendering() aBndry.startPos ==
aBndry.endPos nPtPos 0)
+{
+// nPtPos is the end of the paragraph, select the last word
then.
+--nPtPos;
+aBndry = Boundary( g_pBreakIt-GetBreakIter()-getWordBoundary(
+pTxtNd-GetTxt(), nPtPos,
+g_pBreakIt-GetLocale( pTxtNd-GetLang(
nPtPos ) ),
+nWordType,
+bForward ));
+}
+
if( aBndry.startPos != aBndry.endPos )
{
GetPoint()-nContent = aBndry.endPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/uibase/docvw/edtwin.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 34759884acb4ffe51aa6b7004d1aae7550745b75 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Feb 27 16:44:23 2015 +0100 SwEditWin::SetCursorLogicPosition: use SwCrsrShell::getShellCrsr Using raw GetCrsr() would return the shell cursor even if there is a table cursor. With this, if there is a table selection, the selection start handle can properly shrink and expand the start of the selection. Change-Id: Ic525071639333a00bb5a03a3dd74c4f8052e24f7 diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 751a7e1..482c142 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -6262,10 +6262,10 @@ void SwEditWin::SetCursorLogicPosition(const Point rPosition, bool bPoint, bool // If the mark is to be updated, then exchange the point and mark before // and after, as we can't easily set the mark. if (!bPoint) -rShell.GetCrsr()-Exchange(); +rShell.getShellCrsr(/*bBlock=*/false)-Exchange(); rShell.SetCrsr(rPosition); if (!bPoint) -rShell.GetCrsr()-Exchange(); +rShell.getShellCrsr(/*bBlock=*/false)-Exchange(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/core/crsr/viscrs.cxx | 43 -
1 file changed, 1 insertion(+), 42 deletions(-)
New commits:
commit 8fc976698e4d3d04f61cbad96c0c977ef15115d6
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Feb 11 10:23:20 2015 +0100
Enable LOK_CALLBACK_TEXT_SELECTION_START/END on Android
Change-Id: Id00fcb6fb74652ed38d43b83338ddb0c549c5ae6
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 0b0d63c..46b740b 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -284,7 +284,7 @@ void SwSelPaintRects::Show()
SwRects::clear();
FillRects();
-#if HAVE_FEATURE_DESKTOP
+#if HAVE_FEATURE_DESKTOP || defined(ANDROID)
// get new rects
std::vector basegfx::B2DRange aNewRanges;
@@ -365,47 +365,6 @@ void SwSelPaintRects::Show()
}
HighlightInputFld();
-#else
-
-#if 0 // Totally unclear what we want to do here?
-
-const OutputDevice* pOut = GetShell()-GetWin();
-if ( ! pOut )
-pOut = GetShell()-GetOut();
-SwWrtShell *pWrtShell =
dynamic_castSwWrtShell*(const_castSwCrsrShell*(GetShell()));
-if (!empty())
-{
-if (pWrtShell)
-{
-
-// Buffer will be deallocated in the UI layer
-MLORect *rects = (MLORect *) malloc((sizeof(MLORect))*size());
-for (size_t i = 0; i size(); ++i)
-{
-Point origin = pOut-LogicToPixel((*this)[i].Pos());
-Size ssize = pOut-LogicToPixel((*this)[i].SSize());
-#ifdef IOS
-rects[i] = CGRectMake(origin.X(), origin.Y(),
- ssize.Width(), ssize.Height());
-#else
-// Not yet implemented
-(void) origin;
-(void) ssize;
-#endif
-}
-// GetShell returns a SwCrsrShell which actually is a
SwWrtShell
-
-// touch_ui_selection_start() was dummy both in
TiledLibreOffice (iOS) and for Android
-// touch_ui_selection_start(MLOSelectionText, pWrtShell,
rects, size(), NULL);
-}
-}
-else
-{
-// touch_ui_selection_none was dummy both in TiledLibreOffice
(iOS) and for Android
-// touch_ui_selection_none();
-}
-#endif
-
#endif
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/core/crsr/viscrs.cxx |2 +-
sw/source/core/view/viewsh.cxx |4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 162627299f4450619390f95783fe0bc3013f6af4
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Jan 27 10:59:54 2015 +0100
SwVisCrsr::Show: ignore VisArea() in case of tiled rendering
Which means that then we get the cursor update instantly and can again
ignore all events generated by the client's paintTile() call.
Change-Id: Ie22e20737c30bdd65d25bc6a84f59df4159b7dec
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index d8d0631..247efcb 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -88,7 +88,7 @@ void SwVisCrsr::Show()
m_bIsVisible = true;
// display at all?
-if( m_pCrsrShell-VisArea().IsOver( m_pCrsrShell-m_aCharRect ) )
+if( m_pCrsrShell-VisArea().IsOver( m_pCrsrShell-m_aCharRect ) ||
m_pCrsrShell-isTiledRendering() )
_SetPosAndShow();
}
}
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 14741cd..a893424 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -125,9 +125,7 @@ void
SwViewShell::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallbac
void SwViewShell::libreOfficeKitCallback(int nType, const char* pPayload) const
{
-if (mbInLibreOfficeKitCallback nType == LOK_CALLBACK_INVALIDATE_TILES)
-// Make sure no more invalidation events are issued when we're in the
-// callback already.
+if (mbInLibreOfficeKitCallback)
return;
if (mpLibreOfficeKitCallback)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/uibase/uno/unotxdoc.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit bce0e8c30eae469e19d830544e9b9cb7819d0c26
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Jan 21 18:34:21 2015 +0100
SwXTextDocument::postMouseEvent: missing guard
Change-Id: I1141fe501eddb84a77a7f9f3fdd248a205f2a10c
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 95233e1..d1be7ea 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3175,6 +3175,8 @@ void
SwXTextDocument::registerCallback(LibreOfficeKitCallback pCallback, void* p
void SwXTextDocument::postMouseEvent(int nType, int nX, int nY)
{
+SolarMutexGuard aGuard;
+
SwEditWin rEditWin = pDocShell-GetView()-GetEditWin();
MouseEvent aEvent(Point(nX, nY), 1, MouseEventModifiers::SIMPLECLICK,
MOUSE_LEFT);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/core/view/viewimp.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 435126e00cf48fe95d8f238aec726a378f8392a5
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Jan 15 14:39:45 2015 +0100
SwViewImp::AddPaintRect: when tiled rendering, ignore visual area
With this, gtktiledviewer gets the proper invalidation rectangles after
keypresses.
Change-Id: I9bd1f5b59d05ae93a0a1d018dda8b2efc01cb38c
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index b08aa42..35805bf 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -132,10 +132,16 @@ void SwViewImp::DelRegion()
bool SwViewImp::AddPaintRect( const SwRect rRect )
{
-if ( rRect.IsOver( pSh-VisArea() ) )
+// In case of tiled rendering the visual area is the last painted tile -
not interesting.
+if ( rRect.IsOver( pSh-VisArea() ) || pSh-isTiledRendering() )
{
if ( !pRegion )
-pRegion = new SwRegionRects( pSh-VisArea() );
+{
+// In case of normal rendering, this makes sure only visible
rectangles are painted.
+// Otherwise get the rectangle of the full document, so all paint
rectangles are invalidated.
+const SwRect rArea = pSh-isTiledRendering() ?
pSh-GetLayout()-Frm() : pSh-VisArea();
+pRegion = new SwRegionRects( rArea );
+}
(*pRegion) -= rRect;
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/core/view/viewsh.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 9fa626ccb2b0a0fc7bb83d83fa1ca462cb696bff
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Jan 14 18:35:48 2015 +0100
SwViewShell::PaintTile: paint a small red rectangle as well in debug mode
Change-Id: I246965ac341ef0deeb30f1d3a0c518e67a074869
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 39bc4b1..ac1f3e0 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1822,6 +1822,19 @@ void SwViewShell::PaintTile(VirtualDevice rDevice, int
contextWidth, int contex
// SwViewShell's output device tear down
mpOut = pSaveOut;
mbTiledRendering = bTiledRendering;
+
+static bool bDebug = getenv(SW_DEBUG_TILEDRENDERING) != 0;
+if (bDebug)
+{
+// Draw a small red rectangle in the top left corner so that it's easy
to see where a new tile begins.
+Rectangle aRect(0, 0, 5, 5);
+aRect = rDevice.PixelToLogic(aRect);
+rDevice.Push(PushFlags::FILLCOLOR | PushFlags::LINECOLOR);
+rDevice.SetFillColor(COL_LIGHTRED);
+rDevice.SetLineColor();
+rDevice.DrawRect(aRect);
+rDevice.Pop();
+}
}
#if !HAVE_FEATURE_DESKTOP
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/core/layout/pagechg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8bbcd0315247b945bff1be718b1f2c132b1f08b5 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Jan 14 13:31:27 2015 +0100 sw: missing nullptr check As pointed out by JunitTest_sw_unoapi. Change-Id: Ia553dfb48215fab44f4899223c63ee454ff1c648 diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 9bda8c4..4c8d4e5 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -2026,7 +2026,7 @@ void SwRootFrm::CheckViewLayout( const SwViewOption* pViewOpt, const SwRect* pVi // center page if possible long nSizeDiff = 0; -if (nVisWidth nCurrentRowWidth !GetCurrShell()-isTiledRendering()) +if (nVisWidth nCurrentRowWidth !(GetCurrShell() GetCurrShell()-isTiledRendering())) nSizeDiff = ( nVisWidth - nCurrentRowWidth ) / 2; // adjust positions of pages in current row ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - sw/source
sw/source/core/view/viewsh.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 8c7f98d400ce222b5246b04a681526586bd4e5bf Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Jan 13 12:34:22 2015 +0100 sw: invalidate after keypresses when we have a callback Ideally we could always just invalidate and paint when the main loop says so, but currently without priorities that can take some time. So just do the invalidate-then-paint when we have a callback that is listening to invalidations. Change-Id: I6a835a0a149ae01a4ece3a319dffbe81cd5bd3eb diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 27ec8a3..adbaaba 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -393,7 +393,10 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) if ( bPaintsFromSystem ) PaintDesktop( aRect ); -pCurrentLayout-Paint( aRect ); +if (!mpLibreOfficeKitCallback) +pCurrentLayout-Paint( aRect ); +else + pCurrentLayout-GetCurrShell()-InvalidateWindows(aRect.SVRect()); // #i75172# end DrawingLayer paint DLPostPaint2(true); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
