Merge pull request #146 from balcy/xenial_-_tabtheme

Theme support for the tab list (Rectangle instead of BorderImage) and current zoom text. Fixes #142
ubports · Feb 8, 2019 · 490782b · 490782b
2 parents 102e6c6 + 1c6c7e0
commit 490782b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/app/WebViewImpl.qml b/src/app/WebViewImpl.qml
@@ -798,6 +798,7 @@ WebView {
                 anchors.top: zoomActionsRow.bottom
                 anchors.right: zoomActionsRow.right
                 text: i18n.tr("Current Zoom") + ": " + Math.round(zoomController.currentZoomFactor * 100) + "%"
+                color: theme.palette.normal.backgroundText
                 width: zoomActionsRow.width
                 horizontalAlignment: Text.AlignHCenter
             }

diff --git a/src/app/webbrowser/TabItem.qml b/src/app/webbrowser/TabItem.qml
@@ -46,14 +46,13 @@ Item {
     signal closed()
     signal contextMenu()
 
-    BorderImage {
+    Rectangle {
         id: tabImage
         anchors.fill: parent
         anchors.rightMargin: tabItem.rightMargin
-        source: "assets/tab-%1%2.sci".arg((active) ? "active" :
-                                          (hoverArea.containsMouse ? "hover" : "non-active"))
-                                     .arg(touchEnabled ? "" : "-desktop")
-        asynchronous: true
+        color: theme.palette.normal.background
+        border.color: theme.palette.normal.base
+        radius: units.gu(0.5)
 
         Favicon {
             id: favicon