mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lokdocview: call lok::Document::setClientZoom() after zoom change

Browse Source 
This is similar to what is implemented in online.git's leaflet. If the
zoom factor changes, then inform LOK about it on the first keyboard hit.

Change-Id: I2db4ffed3897db5c852f4b8aea8f4e2d3500a25a
This commit is contained in:
Miklos Vajna
2016-02-01 15:04:08 +01:00
parent dfe5531ec8
commit c84e1e2521
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libreofficekit/source/gtk/lokdocview.cxx
View File

@@ -123,6 +123,12 @@ struct LOKDocViewPrivateImpl
/// View ID, returned by createView() or 0 by default. /// View ID, returned by createView() or 0 by default.
int m_nViewId; int m_nViewId;
/**
* Contains a freshly set zoom level: logic size of a tile.
* It gets reset back to 0 when LOK was informed about this zoom change.
*/
int m_nTileSizeTwips;
LOKDocViewPrivateImpl() LOKDocViewPrivateImpl()
: m_aLOPath(nullptr), : m_aLOPath(nullptr),
m_aDocPath(nullptr), m_aDocPath(nullptr),
@@ -159,7 +165,8 @@ struct LOKDocViewPrivateImpl
m_aHandleEndRect({0, 0, 0, 0}), m_aHandleEndRect({0, 0, 0, 0}),
m_bInDragEndHandle(false), m_bInDragEndHandle(false),
m_pGraphicHandle(nullptr), m_pGraphicHandle(nullptr),
m_nViewId(0) m_nViewId(0),
m_nTileSizeTwips(0)
{ {
memset(&m_aGraphicHandleRects, 0, sizeof(m_aGraphicHandleRects)); memset(&m_aGraphicHandleRects, 0, sizeof(m_aGraphicHandleRects));
memset(&m_bInDragGraphicHandles, 0, sizeof(m_bInDragGraphicHandles)); memset(&m_bInDragGraphicHandles, 0, sizeof(m_bInDragGraphicHandles));
@@ -541,6 +548,20 @@ postKeyEventInThread(gpointer data)
LOEvent* pLOEvent = static_cast<LOEvent*>(g_task_get_task_data(task)); LOEvent* pLOEvent = static_cast<LOEvent*>(g_task_get_task_data(task));
priv->m_pDocument->pClass->setView(priv->m_pDocument, priv->m_nViewId); priv->m_pDocument->pClass->setView(priv->m_pDocument, priv->m_nViewId);
if (priv->m_nTileSizeTwips)
{
std::stringstream ss;
ss << "lok::Document::setClientZoom(" << nTileSizePixels << ", " << nTileSizePixels << ", " << priv->m_nTileSizeTwips << ", " << priv->m_nTileSizeTwips << ")";
g_info("%s", ss.str().c_str());
priv->m_pDocument->pClass->setClientZoom(priv->m_pDocument,
nTileSizePixels,
nTileSizePixels,
priv->m_nTileSizeTwips,
priv->m_nTileSizeTwips);
priv->m_nTileSizeTwips = 0;
}
std::stringstream ss; std::stringstream ss;
ss << "lok::Document::postKeyEvent(" << pLOEvent->m_nKeyEvent << ", " << pLOEvent->m_nCharCode << ", " << pLOEvent->m_nKeyCode << ")"; ss << "lok::Document::postKeyEvent(" << pLOEvent->m_nKeyEvent << ", " << pLOEvent->m_nCharCode << ", " << pLOEvent->m_nKeyCode << ")";
g_info("%s", ss.str().c_str()); g_info("%s", ss.str().c_str());
@@ -2556,6 +2577,8 @@ lok_doc_view_set_zoom (LOKDocView* pDocView, float fZoom)
g_clear_error(&error); g_clear_error(&error);
} }
g_object_unref(task); g_object_unref(task);
priv->m_nTileSizeTwips = pixelToTwip(nTileSizePixels, priv->m_fZoom);
} }
SAL_DLLPUBLIC_EXPORT gfloat SAL_DLLPUBLIC_EXPORT gfloat