ubuntu-touch-coreapps-reviewers team mailing list archive

[Stefano Verzegnassi <stefano92.100@xxxxxxxxx>]

Stefano Verzegnassi has proposed merging lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1515037 into lp:ubuntu-docviewer-app/reboot.

Commit message:
[lok-qml] Fixed broken SHOW_TILE_BORDER mode

Requested reviews:
  Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)
Related bugs:
  Bug #1515037 in Ubuntu Document Viewer App: "DEBUG_SHOW_TILE_BORDER mode broken in libreofficekit-qml-plugin"
  https://bugs.launchpad.net/ubuntu-docviewer-app/+bug/1515037

For more details, see:
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/fix-1515037/+merge/277466

[lok-qml] Fixed broken SHOW_TILE_BORDER mode
-- 
Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1515037 into lp:ubuntu-docviewer-app/reboot.

=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/config.h'
--- src/plugin/libreofficetoolkit-qml-plugin/config.h	2015-10-13 19:08:48 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/config.h	2015-11-13 17:01:56 +0000
@@ -18,7 +18,6 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-// FIXME: Perhaps we want to use smaller tiles on mobile devices?
 #define TILE_SIZE 256.0
 
 // Uncomment it if you want to see tiles boundaries

=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.cpp'
--- src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.cpp	2015-10-12 00:02:26 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.cpp	2015-11-13 17:01:56 +0000
@@ -1,6 +1,5 @@
 #include "sgtileitem.h"
 #include "lodocument.h"
-#include "config.h"
 
 #include <QQuickWindow>
 #include <QSGSimpleTextureNode>
@@ -51,9 +50,9 @@
 }
 
 #ifdef DEBUG_SHOW_TILE_BORDER
-void SGTileItem::drawTileBorders(QSGNode* basicNode)
+void SGTileItem::drawTileBorders(QSGSimpleTextureNode* parentNode)
 {
-    auto node = basicNode;
+    auto node = parentNode;
     auto tileBorderGeometry = new QSGGeometry(QSGGeometry::defaultAttributes_Point2D(), 8);
     tileBorderGeometry->setDrawingMode(GL_LINES);
     tileBorderGeometry->setLineWidth(4);

=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.h'
--- src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.h	2015-10-11 11:27:29 +0000
+++ src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.h	2015-11-13 17:01:56 +0000
@@ -4,8 +4,14 @@
 #include <QQuickItem>
 #include <QImage>
 
+#include "config.h"
+
 class LODocument;
 
+#ifdef DEBUG_SHOW_TILE_BORDER
+class QSGSimpleTextureNode;
+#endif
+
 class SGTileItem : public QQuickItem
 {
     Q_OBJECT
@@ -31,7 +37,7 @@
 
 private:
 #ifdef DEBUG_SHOW_TILE_BORDER
-    void drawTileBorders(QSGNode* basicNode);
+    void drawTileBorders(QSGSimpleTextureNode *parentNode);
 #endif
 
 private: