Blame SOURCES/0247-gtktiledviewer-add-missing-spreadsheet-corner-button.patch

135360
From d2cc43af0d971232e843b20a7f2370baf5aecd17 Mon Sep 17 00:00:00 2001
135360
From: Miklos Vajna <vmiklos@collabora.co.uk>
135360
Date: Fri, 30 Oct 2015 16:20:58 +0100
135360
Subject: [PATCH 247/398] gtktiledviewer: add missing spreadsheet corner button
135360
135360
Change-Id: I3a7af693ccdce2012ddbaa6a3ac8321f29b6356c
135360
(cherry picked from commit f5ab3e84dfd58722dc74c7369c1ad67237ca462e)
135360
---
135360
 .../qa/gtktiledviewer/gtktiledviewer.cxx           | 52 +++++++++++++++++++++-
135360
 1 file changed, 51 insertions(+), 1 deletion(-)
135360
135360
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
index 08058e8699c9..eec80ba0b727 100644
135360
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
@@ -67,6 +67,16 @@ public:
135360
     static void drawText(cairo_t* pCairo, const GdkRectangle& rRectangle, const std::string& rText);
135360
 };
135360
 
135360
+/// Represents the button at the top left corner for spreadsheets.
135360
+class TiledCornerButton
135360
+{
135360
+public:
135360
+    GtkWidget* m_pDrawingArea;
135360
+    TiledCornerButton();
135360
+    static gboolean draw(GtkWidget* pWidget, cairo_t* pCairo, gpointer pData);
135360
+    gboolean drawImpl(GtkWidget* pWidget, cairo_t* pCairo);
135360
+};
135360
+
135360
 /// Represents all the state that is specific to one GtkWindow of this app.
135360
 class TiledWindow
135360
 {
135360
@@ -93,6 +103,7 @@ public:
135360
     bool m_bFindAll;
135360
     std::shared_ptr<TiledRowColumnBar> m_pRowBar;
135360
     std::shared_ptr<TiledRowColumnBar> m_pColumnBar;
135360
+    std::shared_ptr<TiledCornerButton> m_pCornerButton;
135360
 
135360
     TiledWindow()
135360
         : m_pDocView(0),
135360
@@ -169,6 +180,9 @@ gboolean TiledRowColumnBar::drawImpl(GtkWidget* /*pWidget*/, cairo_t* pCairo)
135360
             aRectangle.y = nTotal - 1;
135360
             aRectangle.width = ROW_HEADER_WIDTH - 1;
135360
             aRectangle.height = rHeader.m_nSize;
135360
+            // Left line.
135360
+            cairo_rectangle(pCairo, aRectangle.x, aRectangle.y, 1, aRectangle.height);
135360
+            cairo_fill(pCairo);
135360
             // Bottom line.
135360
             cairo_rectangle(pCairo, aRectangle.x, aRectangle.y + aRectangle.height, aRectangle.width, 1);
135360
             cairo_fill(pCairo);
135360
@@ -178,10 +192,13 @@ gboolean TiledRowColumnBar::drawImpl(GtkWidget* /*pWidget*/, cairo_t* pCairo)
135360
         }
135360
         else
135360
         {
135360
-            aRectangle.x = nTotal -1;
135360
+            aRectangle.x = nTotal - 1;
135360
             aRectangle.y = 0;
135360
             aRectangle.width = rHeader.m_nSize;
135360
             aRectangle.height = COLUMN_HEADER_HEIGHT - 1;
135360
+            // Top line.
135360
+            cairo_rectangle(pCairo, aRectangle.x, aRectangle.y, aRectangle.width, 1);
135360
+            cairo_fill(pCairo);
135360
             // Right line.
135360
             cairo_rectangle(pCairo, aRectangle.x + aRectangle.width , aRectangle.y, 1, aRectangle.height);
135360
             cairo_fill(pCairo);
135360
@@ -216,6 +233,8 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* pDocView, GdkEventConfi
135360
         boost::property_tree::ptree aTree;
135360
         boost::property_tree::read_json(aStream, aTree);
135360
 
135360
+        gtk_widget_show(rWindow.m_pCornerButton->m_pDrawingArea);
135360
+
135360
         rWindow.m_pRowBar->m_aHeaders.clear();
135360
         for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("rows"))
135360
         {
135360
@@ -238,6 +257,33 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* pDocView, GdkEventConfi
135360
     return TRUE;
135360
 }
135360
 
135360
+TiledCornerButton::TiledCornerButton()
135360
+    : m_pDrawingArea(gtk_drawing_area_new())
135360
+{
135360
+    gtk_widget_set_size_request(m_pDrawingArea, TiledRowColumnBar::ROW_HEADER_WIDTH, TiledRowColumnBar::COLUMN_HEADER_HEIGHT);
135360
+    g_signal_connect(m_pDrawingArea, "draw", G_CALLBACK(TiledCornerButton::draw), this);
135360
+}
135360
+
135360
+gboolean TiledCornerButton::draw(GtkWidget* pWidget, cairo_t* pCairo, gpointer pData)
135360
+{
135360
+    return static_cast<TiledCornerButton*>(pData)->drawImpl(pWidget, pCairo);
135360
+}
135360
+
135360
+gboolean TiledCornerButton::drawImpl(GtkWidget* /*pWidget*/, cairo_t* pCairo)
135360
+{
135360
+    cairo_set_source_rgb(pCairo, 0, 0, 0);
135360
+
135360
+    GdkRectangle aRectangle;
135360
+    aRectangle.x = 0;
135360
+    aRectangle.y = 0;
135360
+    aRectangle.width = TiledRowColumnBar::ROW_HEADER_WIDTH;
135360
+    aRectangle.height = TiledRowColumnBar::COLUMN_HEADER_HEIGHT;
135360
+    cairo_rectangle(pCairo, aRectangle.x, aRectangle.y, aRectangle.width, aRectangle.height);
135360
+    cairo_stroke(pCairo);
135360
+
135360
+    return FALSE;
135360
+}
135360
+
135360
 static void lcl_registerToolItem(TiledWindow& rWindow, GtkToolItem* pItem, const std::string& rName)
135360
 {
135360
     rWindow.m_aToolItemCommandNames[pItem] = rName;
135360
@@ -946,6 +992,9 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
135360
     // Grid for the row/column bar + doc view.
135360
     GtkWidget* pGrid = gtk_grid_new();
135360
     gtk_container_add(GTK_CONTAINER(rWindow.m_pVBox), pGrid);
135360
+    rWindow.m_pCornerButton.reset(new TiledCornerButton());
135360
+    // "A1" cell of the grid.
135360
+    gtk_grid_attach(GTK_GRID(pGrid), rWindow.m_pCornerButton->m_pDrawingArea, 0, 0, 1, 1);
135360
     rWindow.m_pRowBar.reset(new TiledRowColumnBar(TiledRowColumnBar::ROW));
135360
     // "A2" cell of the grid.
135360
     gtk_grid_attach(GTK_GRID(pGrid), rWindow.m_pRowBar->m_pDrawingArea, 0, 1, 1, 1);
135360
@@ -976,6 +1025,7 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
135360
     // Hide the findbar by default.
135360
     gtk_widget_hide(rWindow.m_pFindbar);
135360
     // Same for the row/column bar.
135360
+    gtk_widget_hide(rWindow.m_pCornerButton->m_pDrawingArea);
135360
     gtk_widget_hide(rWindow.m_pRowBar->m_pDrawingArea);
135360
     gtk_widget_hide(rWindow.m_pColumnBar->m_pDrawingArea);
135360
 
135360
-- 
135360
2.12.0
135360