Merge lp:~hiroshidi/ubuntu-terminal-app/plugin-text-display-fix into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/plugin

[Dmitry Zagnoyko]

Fixed text displaying bug (LP: #1182503)

Bug: Command does not appear until enter is pressed.
Cause: float font metric
Fix: force integer font metric

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:13
http://91.189.93.125:8080/job/ubuntu-terminal-app-plugin-ci/3/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-terminal-app-plugin-quantal-amd64-ci/1
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-terminal-app-plugin-raring-amd64-ci/3

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-terminal-app-plugin-ci/3/rebuild

review: Approve (continuous-integration)

[lp:~hiroshidi/ubuntu-terminal-app/plugin-text-display-fix]

14. By Dmitry Zagnoyko on 2013-06-10

Added platform definition

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:14
http://91.189.93.125:8080/job/ubuntu-terminal-app-plugin-ci/4/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-terminal-app-plugin-quantal-amd64-ci/2
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-terminal-app-plugin-raring-amd64-ci/4

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-terminal-app-plugin-ci/4/rebuild

review: Approve (continuous-integration)

[Michael Hall (mhall119)]

Looks good to me

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-13 15:44:25 +0000
+++ debian/changelog	2013-06-10 15:54:25 +0000
@@ -1,3 +1,9 @@
+konsole-qml-plugin (0.1.2) raring; urgency=low
+
+  * Fixed text display bug (LP:#1182503)
+
+ -- Dmitry Zagnoyko <[e-mail]>  Mon, 10 Jun 2013 09:49:02 +0300
+
 konsole-qml-plugin (0.1.1) raring; urgency=low
 
   * Fixed issue with float values of widget size

=== modified file 'konsole-qml-plugin.pro'
--- konsole-qml-plugin.pro	2013-04-27 15:16:34 +0000
+++ konsole-qml-plugin.pro	2013-06-10 15:54:25 +0000
@@ -8,6 +8,9 @@
 
 DEFINES += HAVE_POSIX_OPENPT HAVE_SYS_TIME_H HAVE_UPDWTMPX
 
+#MANUALY DEFINED PLATFORM
+DEFINES += Q_WS_UBUNTU
+
 TARGET = kdekonsole
 PLUGIN_IMPORT_PATH = org/kde/konsole
 PLUGIN_ASSETS = $$PWD/assets/*

=== modified file 'src/TerminalDisplay.cpp'
--- src/TerminalDisplay.cpp	2013-05-04 11:51:15 +0000
+++ src/TerminalDisplay.cpp	2013-06-10 15:54:25 +0000
@@ -167,8 +167,17 @@
     m_widgetRect = QRectF(0,0,1,1);
 
     m_palette = qApp->palette();
+
     m_font = QFont("Monospace",16);
 
+#ifdef Q_WS_UBUNTU
+#if QT_VERSION >= 0x040700
+    m_font.setStyleStrategy(QFont::ForceIntegerMetrics);
+#else
+#warning "Correct handling of the QFont metrics requited Qt>=4.7"
+#endif
+#endif
+
     // The offsets are not yet calculated.
     // Do not calculate these too often to be more smoothly when resizing
     // konsole in opaque mode.
@@ -367,10 +376,8 @@
 {
   QFont font = f;
 
-#ifdef Q_WS_MAC
+#if defined(Q_WS_MAC) || defined(Q_WS_UBUNTU)
 #if QT_VERSION >= 0x040700
-    // mac uses floats for font width specification.
-    // this ensures the same handling for all platforms
     font.setStyleStrategy(QFont::ForceIntegerMetrics);
 #else
 #warning "Correct handling of the QFont metrics requited Qt>=4.7"
@@ -1916,6 +1923,14 @@
        font.setUnderline(useUnderline);
     }
 
+#ifdef Q_WS_UBUNTU
+#if QT_VERSION >= 0x040700
+    font.setStyleStrategy(QFont::ForceIntegerMetrics);
+#else
+#warning "Correct handling of the QFont metrics requited Qt>=4.7"
+#endif
+#endif
+
     painter->setFont(font);
 
     // setup pen