[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - 2 commits - libreofficekit/source svx/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Mar 27 01:22:05 PDT 2015
libreofficekit/source/gtk/lokdocview.cxx | 174 ++++++++++++++++---------------
svx/source/table/tablecontroller.cxx | 32 +++++
2 files changed, 124 insertions(+), 82 deletions(-)
New commits:
commit f089d9f1e72a46a6aeecf15eab0515a413847345
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Mar 27 09:19:25 2015 +0100
svx tiled rendering: double-click in empty table cell selects it
This brings Impress tables in sync with Writer, where long push on
Android selects the empty cell.
Change-Id: If8403ec43daeea6ca79b488a54253cb8b71794d9
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 14f19f3..a82af2b 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -248,6 +248,16 @@ bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWindow
bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWindow )
{
+ if (mxTableObj->GetModel()->isTiledRendering() && !pWindow)
+ {
+ // Tiled rendering: get the window that has the disabled map mode.
+ if (OutputDevice* pOutputDevice = mpView->GetFirstOutputDevice())
+ {
+ if (pOutputDevice->GetOutDevType() == OUTDEV_WINDOW)
+ pWindow = static_cast<vcl::Window*>(pOutputDevice);
+ }
+ }
+
if( !pWindow || !checkTableObject() )
return false;
@@ -294,6 +304,28 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window*
}
}
+ if (mxTableObj->GetModel()->isTiledRendering() && rMEvt.GetClicks() == 2 && rMEvt.IsLeft() && eHit == SDRTABLEHIT_CELLTEXTAREA)
+ {
+ bool bEmptyOutliner = false;
+ if (Outliner* pOutliner = mpView->GetTextEditOutliner())
+ {
+ if (pOutliner->GetParagraphCount() == 1)
+ {
+ if (Paragraph* pParagraph = pOutliner->GetParagraph(0))
+ bEmptyOutliner = pOutliner->GetText(pParagraph).isEmpty();
+ }
+ }
+ if (bEmptyOutliner)
+ {
+ // Tiled rendering: a left double-click in an empty cell: select it.
+ StartSelection(maMouseDownPos);
+ setSelectedCells(maMouseDownPos, maMouseDownPos);
+ // Update graphic selection, should be hidden now.
+ mpView->AdjustMarkHdl();
+ return true;
+ }
+ }
+
return false;
}
commit 8a65c55d29fed05bab95907f53d34574410fe909
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Mar 27 09:17:26 2015 +0100
lokdocview: move cursor / selection overlay to LOKDocView_Impl
Change-Id: I48a6906382fd41906a06704855d2f054467c1716
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 90fa014..ebcf11f 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -128,6 +128,10 @@ struct LOKDocView_Impl
static gboolean signalMotion(GtkWidget* pEventBox, GdkEventButton* pEvent, LOKDocView* pDocView);
/// Implementation of motion event handler, invoked by signalMotion().
gboolean signalMotionImpl(GdkEventButton* pEvent);
+ /// Receives an expose event.
+ static gboolean renderOverlay(GtkWidget* pWidget, GdkEventExpose* pEvent, LOKDocView* pDocView);
+ /// Implementation of expose event handler (renders cursor and selection overlay), invoked by renderOverlay().
+ gboolean renderOverlayImpl(GtkWidget* pEventBox);
};
LOKDocView_Impl::LOKDocView_Impl(LOKDocView* pDocView)
@@ -446,9 +450,95 @@ gboolean LOKDocView_Impl::signalMotionImpl(GdkEventButton* pEvent)
return FALSE;
}
+gboolean LOKDocView_Impl::renderOverlay(GtkWidget* pEventBox, GdkEventExpose* /*pEvent*/, LOKDocView* pDocView)
+{
+ return pDocView->m_pImpl->renderOverlayImpl(pEventBox);
+}
+
+static gboolean lcl_isEmptyRectangle(GdkRectangle* pRectangle);
+static void lcl_renderHandle(cairo_t* pCairo, GdkRectangle* pCursor, cairo_surface_t* pHandle,
+ GdkRectangle* pRectangle, LOKDocView* pDocView);
+static void lcl_renderGraphicHandle(cairo_t* pCairo, GdkRectangle* pSelection, cairo_surface_t* pHandle, GdkRectangle* pGraphicHandleRects, LOKDocView* pDocView);
+
+gboolean LOKDocView_Impl::renderOverlayImpl(GtkWidget* pWidget)
+{
+#if GTK_CHECK_VERSION(2,14,0) // we need gtk_widget_get_window()
+ cairo_t* pCairo = gdk_cairo_create(gtk_widget_get_window(pWidget));
+
+ if (m_bEdit && m_bCursorVisible && m_bCursorOverlayVisible && !lcl_isEmptyRectangle(&m_aVisibleCursor))
+ {
+ if (m_aVisibleCursor.width < 30)
+ // Set a minimal width if it would be 0.
+ m_aVisibleCursor.width = 30;
+
+ cairo_set_source_rgb(pCairo, 0, 0, 0);
+ cairo_rectangle(pCairo,
+ twipToPixel(m_aVisibleCursor.x),
+ twipToPixel(m_aVisibleCursor.y),
+ twipToPixel(m_aVisibleCursor.width),
+ twipToPixel(m_aVisibleCursor.height));
+ cairo_fill(pCairo);
+ }
+
+ if (m_bEdit && m_bCursorVisible && !lcl_isEmptyRectangle(&m_aVisibleCursor) && !m_pTextSelectionRectangles)
+ {
+ // Have a cursor, but no selection: we need the middle handle.
+ if (!m_pHandleMiddle)
+ m_pHandleMiddle = cairo_image_surface_create_from_png(CURSOR_HANDLE_DIR "handle_middle.png");
+ lcl_renderHandle(pCairo, &m_aVisibleCursor, m_pHandleMiddle, &m_aHandleMiddleRect, m_pDocView);
+ }
+
+ if (m_pTextSelectionRectangles)
+ {
+ for (GList* i = m_pTextSelectionRectangles; i != NULL; i = i->next)
+ {
+ GdkRectangle* pRectangle = static_cast<GdkRectangle*>(i->data);
+ // Blue with 75% transparency.
+ cairo_set_source_rgba(pCairo, ((double)0x43)/255, ((double)0xac)/255, ((double)0xe8)/255, 0.25);
+ cairo_rectangle(pCairo,
+ twipToPixel(pRectangle->x),
+ twipToPixel(pRectangle->y),
+ twipToPixel(pRectangle->width),
+ twipToPixel(pRectangle->height));
+ cairo_fill(pCairo);
+ }
+
+ // Handles
+ if (!lcl_isEmptyRectangle(&m_aTextSelectionStart))
+ {
+ // Have a start position: we need a start handle.
+ if (!m_pHandleStart)
+ m_pHandleStart = cairo_image_surface_create_from_png(CURSOR_HANDLE_DIR "handle_start.png");
+ lcl_renderHandle(pCairo, &m_aTextSelectionStart,
+ m_pHandleStart, &m_aHandleStartRect,
+ m_pDocView);
+ }
+ if (!lcl_isEmptyRectangle(&m_aTextSelectionEnd))
+ {
+ // Have a start position: we need an end handle.
+ if (!m_pHandleEnd)
+ m_pHandleEnd = cairo_image_surface_create_from_png(CURSOR_HANDLE_DIR "handle_end.png");
+ lcl_renderHandle(pCairo, &m_aTextSelectionEnd,
+ m_pHandleEnd, &m_aHandleEndRect,
+ m_pDocView);
+ }
+ }
+
+ if (!lcl_isEmptyRectangle(&m_aGraphicSelection))
+ {
+ if (!m_pGraphicHandle)
+ m_pGraphicHandle = cairo_image_surface_create_from_png(CURSOR_HANDLE_DIR "handle_graphic.png");
+ lcl_renderGraphicHandle(pCairo, &m_aGraphicSelection, m_pGraphicHandle, m_aGraphicHandleRects, m_pDocView);
+ }
+
+ cairo_destroy(pCairo);
+#endif
+ return FALSE;
+}
+
+
static void lok_docview_class_init( gpointer );
static void lok_docview_init( GTypeInstance *, gpointer );
-static gboolean renderOverlay(GtkWidget* pWidget, GdkEventExpose* pEvent, gpointer pData);
SAL_DLLPUBLIC_EXPORT guint lok_docview_get_type()
{
@@ -519,8 +609,7 @@ static void lok_docview_init( GTypeInstance* pInstance, gpointer )
gtk_widget_show( pDocView->m_pImpl->m_pEventBox );
gtk_signal_connect(GTK_OBJECT(pDocView), "destroy", GTK_SIGNAL_FUNC(LOKDocView_Impl::destroy), 0);
- g_signal_connect_after(pDocView->m_pImpl->m_pEventBox, "expose-event",
- G_CALLBACK(renderOverlay), pDocView);
+ g_signal_connect_after(pDocView->m_pImpl->m_pEventBox, "expose-event", G_CALLBACK(LOKDocView_Impl::renderOverlay), pDocView);
}
SAL_DLLPUBLIC_EXPORT GtkWidget* lok_docview_new( LibreOfficeKit* pOffice )
@@ -649,85 +738,6 @@ static void lcl_renderGraphicHandle(cairo_t* pCairo, GdkRectangle* pSelection, c
}
}
-static gboolean renderOverlay(GtkWidget* pWidget, GdkEventExpose* /*pEvent*/, gpointer pData)
-{
-#if GTK_CHECK_VERSION(2,14,0) // we need gtk_widget_get_window()
- LOKDocView* pDocView = LOK_DOCVIEW(pData);
- cairo_t* pCairo = gdk_cairo_create(gtk_widget_get_window(pWidget));
-
- if (pDocView->m_pImpl->m_bEdit && pDocView->m_pImpl->m_bCursorVisible && pDocView->m_pImpl->m_bCursorOverlayVisible && !lcl_isEmptyRectangle(&pDocView->m_pImpl->m_aVisibleCursor))
- {
- if (pDocView->m_pImpl->m_aVisibleCursor.width < 30)
- // Set a minimal width if it would be 0.
- pDocView->m_pImpl->m_aVisibleCursor.width = 30;
-
- cairo_set_source_rgb(pCairo, 0, 0, 0);
- cairo_rectangle(pCairo,
- pDocView->m_pImpl->twipToPixel(pDocView->m_pImpl->m_aVisibleCursor.x),
- pDocView->m_pImpl->twipToPixel(pDocView->m_pImpl->m_aVisibleCursor.y),
- pDocView->m_pImpl->twipToPixel(pDocView->m_pImpl->m_aVisibleCursor.width),
- pDocView->m_pImpl->twipToPixel(pDocView->m_pImpl->m_aVisibleCursor.height));
- cairo_fill(pCairo);
- }
-
- if (pDocView->m_pImpl->m_bEdit && pDocView->m_pImpl->m_bCursorVisible && !lcl_isEmptyRectangle(&pDocView->m_pImpl->m_aVisibleCursor) && !pDocView->m_pImpl->m_pTextSelectionRectangles)
- {
- // Have a cursor, but no selection: we need the middle handle.
- if (!pDocView->m_pImpl->m_pHandleMiddle)
- pDocView->m_pImpl->m_pHandleMiddle = cairo_image_surface_create_from_png(CURSOR_HANDLE_DIR "handle_middle.png");
- lcl_renderHandle(pCairo, &pDocView->m_pImpl->m_aVisibleCursor,
- pDocView->m_pImpl->m_pHandleMiddle, &pDocView->m_pImpl->m_aHandleMiddleRect,
- pDocView);
- }
-
- if (pDocView->m_pImpl->m_pTextSelectionRectangles)
- {
- for (GList* i = pDocView->m_pImpl->m_pTextSelectionRectangles; i != NULL; i = i->next)
- {
- GdkRectangle* pRectangle = static_cast<GdkRectangle*>(i->data);
- // Blue with 75% transparency.
- cairo_set_source_rgba(pCairo, ((double)0x43)/255, ((double)0xac)/255, ((double)0xe8)/255, 0.25);
- cairo_rectangle(pCairo,
- pDocView->m_pImpl->twipToPixel(pRectangle->x),
- pDocView->m_pImpl->twipToPixel(pRectangle->y),
- pDocView->m_pImpl->twipToPixel(pRectangle->width),
- pDocView->m_pImpl->twipToPixel(pRectangle->height));
- cairo_fill(pCairo);
- }
-
- // Handles
- if (!lcl_isEmptyRectangle(&pDocView->m_pImpl->m_aTextSelectionStart))
- {
- // Have a start position: we need a start handle.
- if (!pDocView->m_pImpl->m_pHandleStart)
- pDocView->m_pImpl->m_pHandleStart = cairo_image_surface_create_from_png(CURSOR_HANDLE_DIR "handle_start.png");
- lcl_renderHandle(pCairo, &pDocView->m_pImpl->m_aTextSelectionStart,
- pDocView->m_pImpl->m_pHandleStart, &pDocView->m_pImpl->m_aHandleStartRect,
- pDocView);
- }
- if (!lcl_isEmptyRectangle(&pDocView->m_pImpl->m_aTextSelectionEnd))
- {
- // Have a start position: we need an end handle.
- if (!pDocView->m_pImpl->m_pHandleEnd)
- pDocView->m_pImpl->m_pHandleEnd = cairo_image_surface_create_from_png(CURSOR_HANDLE_DIR "handle_end.png");
- lcl_renderHandle(pCairo, &pDocView->m_pImpl->m_aTextSelectionEnd,
- pDocView->m_pImpl->m_pHandleEnd, &pDocView->m_pImpl->m_aHandleEndRect,
- pDocView);
- }
- }
-
- if (!lcl_isEmptyRectangle(&pDocView->m_pImpl->m_aGraphicSelection))
- {
- if (!pDocView->m_pImpl->m_pGraphicHandle)
- pDocView->m_pImpl->m_pGraphicHandle = cairo_image_surface_create_from_png(CURSOR_HANDLE_DIR "handle_graphic.png");
- lcl_renderGraphicHandle(pCairo, &pDocView->m_pImpl->m_aGraphicSelection, pDocView->m_pImpl->m_pGraphicHandle, pDocView->m_pImpl->m_aGraphicHandleRects, pDocView);
- }
-
- cairo_destroy(pCairo);
-#endif
- return FALSE;
-}
-
void renderDocument(LOKDocView* pDocView, GdkRectangle* pPartial)
{
const int nTileSizePixels = 256;
More information about the Libreoffice-commits
mailing list