Blame SOURCES/0260-gtktiledviewer-adjust-spreadsheet-row-column-headers.patch

135360
From 380e289f5d0a7af5df0d0ed7b4a8d940e01a35b1 Mon Sep 17 00:00:00 2001
135360
From: Miklos Vajna <vmiklos@collabora.co.uk>
135360
Date: Mon, 2 Nov 2015 17:03:08 +0100
135360
Subject: [PATCH 260/398] gtktiledviewer: adjust spreadsheet row/column headers
135360
 on scrolling
135360
135360
Change-Id: I7ed9e19df071b6baf1e941faee24c332c7b5e804
135360
(cherry picked from commit 7c4733661b0a80098e84413fbc91b84b4c14cfc1)
135360
---
135360
 .../qa/gtktiledviewer/gtktiledviewer.cxx           | 43 ++++++++++++++++++++--
135360
 1 file changed, 39 insertions(+), 4 deletions(-)
135360
135360
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
index 7e6379124678..795fb4ed7ff7 100644
135360
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
@@ -57,12 +57,16 @@ public:
135360
     std::vector<Header> m_aHeaders;
135360
     /// Height for row bar, width for column bar.
135360
     int m_nSizePixel;
135360
+    /// Left/top position for the column/row bar -- initially 0, then may grow due to scrolling.
135360
+    int m_nPositionPixel;
135360
     TiledBarType m_eType;
135360
 
135360
     TiledRowColumnBar(TiledBarType eType);
135360
     static gboolean draw(GtkWidget* pWidget, cairo_t* pCairo, gpointer pData);
135360
     gboolean drawImpl(GtkWidget* pWidget, cairo_t* pCairo);
135360
     static gboolean docConfigureEvent(GtkWidget* pWidget, GdkEventConfigure* pEvent, gpointer pData);
135360
+    /// Adjustments of the doc widget changed -- horizontal or vertical scroll.
135360
+    static void docAdjustmentChanged(GtkAdjustment* pAdjustment, gpointer pData);
135360
     /// Draws rText at the center of rRectangle on pCairo.
135360
     static void drawText(cairo_t* pCairo, const GdkRectangle& rRectangle, const std::string& rText);
135360
 };
135360
@@ -233,17 +237,26 @@ gboolean TiledRowColumnBar::drawImpl(GtkWidget* /*pWidget*/, cairo_t* pCairo)
135360
     return FALSE;
135360
 }
135360
 
135360
+void TiledRowColumnBar::docAdjustmentChanged(GtkAdjustment* /*pAdjustment*/, gpointer pData)
135360
+{
135360
+    GtkWidget* pDocView = static_cast<GtkWidget*>(pData);
135360
+    docConfigureEvent(pDocView, 0, 0);
135360
+}
135360
+
135360
 gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* pDocView, GdkEventConfigure* /*pEvent*/, gpointer /*pData*/)
135360
 {
135360
     TiledWindow& rWindow = lcl_getTiledWindow(pDocView);
135360
     GtkAdjustment* pVAdjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(rWindow.m_pScrolledWindow));
135360
     rWindow.m_pRowBar->m_nSizePixel = gtk_adjustment_get_page_size(pVAdjustment);
135360
+    rWindow.m_pRowBar->m_nPositionPixel = gtk_adjustment_get_value(pVAdjustment);
135360
     GtkAdjustment* pHAdjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(rWindow.m_pScrolledWindow));
135360
     rWindow.m_pColumnBar->m_nSizePixel = gtk_adjustment_get_page_size(pHAdjustment);
135360
+    rWindow.m_pColumnBar->m_nPositionPixel = gtk_adjustment_get_value(pHAdjustment);
135360
 
135360
     LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(LOK_DOC_VIEW(pDocView));
135360
     if (pDocument && pDocument->pClass->getDocumentType(pDocument) == LOK_DOCTYPE_SPREADSHEET)
135360
     {
135360
+        g_info("lok::Document::getCommandValues(.uno:ViewRowColumnHeaders)");
135360
         char* pValues = pDocument->pClass->getCommandValues(pDocument, ".uno:ViewRowColumnHeaders");
135360
         std::stringstream aStream(pValues);
135360
         free(pValues);
135360
@@ -254,21 +267,39 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* pDocView, GdkEventConfi
135360
         gtk_widget_show(rWindow.m_pCornerButton->m_pDrawingArea);
135360
 
135360
         rWindow.m_pRowBar->m_aHeaders.clear();
135360
+        int nTotal = 0;
135360
         for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("rows"))
135360
         {
135360
             int nSize = lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView), std::atof(rValue.second.get<std::string>("size").c_str()));
135360
-            Header aHeader(nSize, rValue.second.get<std::string>("text"));
135360
-            rWindow.m_pRowBar->m_aHeaders.push_back(aHeader);
135360
+            int nScrolledSize = nSize;
135360
+            if (nTotal + nSize >= rWindow.m_pRowBar->m_nPositionPixel)
135360
+            {
135360
+                if (nTotal < rWindow.m_pRowBar->m_nPositionPixel)
135360
+                    // First visible row: reduce height because the row is only partially visible.
135360
+                    nScrolledSize = nTotal + nSize - rWindow.m_pRowBar->m_nPositionPixel;
135360
+                Header aHeader(nScrolledSize, rValue.second.get<std::string>("text"));
135360
+                rWindow.m_pRowBar->m_aHeaders.push_back(aHeader);
135360
+            }
135360
+            nTotal += nSize;
135360
         }
135360
         gtk_widget_show(rWindow.m_pRowBar->m_pDrawingArea);
135360
         gtk_widget_queue_draw(rWindow.m_pRowBar->m_pDrawingArea);
135360
 
135360
         rWindow.m_pColumnBar->m_aHeaders.clear();
135360
+        nTotal = 0;
135360
         for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("columns"))
135360
         {
135360
             int nSize = lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView), std::atof(rValue.second.get<std::string>("size").c_str()));
135360
-            Header aHeader(nSize, rValue.second.get<std::string>("text"));
135360
-            rWindow.m_pColumnBar->m_aHeaders.push_back(aHeader);
135360
+            int nScrolledSize = nSize;
135360
+            if (nTotal + nSize >= rWindow.m_pColumnBar->m_nPositionPixel)
135360
+            {
135360
+                if (nTotal < rWindow.m_pColumnBar->m_nPositionPixel)
135360
+                    // First visible column: reduce width because the column is only partially visible.
135360
+                    nScrolledSize = nTotal + nSize - rWindow.m_pColumnBar->m_nPositionPixel;
135360
+                Header aHeader(nScrolledSize, rValue.second.get<std::string>("text"));
135360
+                rWindow.m_pColumnBar->m_aHeaders.push_back(aHeader);
135360
+            }
135360
+            nTotal += nSize;
135360
         }
135360
         gtk_widget_show(rWindow.m_pColumnBar->m_pDrawingArea);
135360
         gtk_widget_queue_draw(rWindow.m_pColumnBar->m_pDrawingArea);
135360
@@ -1094,6 +1125,10 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
135360
     gtk_grid_attach(GTK_GRID(pGrid), rWindow.m_pScrolledWindow, 1, 1, 1, 1);
135360
 
135360
     gtk_container_add(GTK_CONTAINER(rWindow.m_pScrolledWindow), rWindow.m_pDocView);
135360
+    GtkAdjustment* pHAdjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(rWindow.m_pScrolledWindow));
135360
+    g_signal_connect(pHAdjustment, "value-changed", G_CALLBACK(TiledRowColumnBar::docAdjustmentChanged), rWindow.m_pDocView);
135360
+    GtkAdjustment* pVAdjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(rWindow.m_pScrolledWindow));
135360
+    g_signal_connect(pVAdjustment, "value-changed", G_CALLBACK(TiledRowColumnBar::docAdjustmentChanged), rWindow.m_pDocView);
135360
 
135360
     rWindow.m_pProgressBar = gtk_progress_bar_new ();
135360
     g_signal_connect(rWindow.m_pDocView, "load-changed", G_CALLBACK(loadChanged), rWindow.m_pProgressBar);
135360
-- 
135360
2.12.0
135360