From 51a5f05e48d810bddd9d50829df9b973b3eb7fa5 Mon Sep 17 00:00:00 2001
From: Michael Bohlender <michael.bohlender@kdemail.net>
Date: Sun, 29 May 2016 12:12:33 +0200
Subject: make toolbar icons square again

---
 components/mail/contents/ui/main.qml | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'components/mail/contents/ui')

diff --git a/components/mail/contents/ui/main.qml b/components/mail/contents/ui/main.qml
index b8425adc..e0ffcb20 100644
--- a/components/mail/contents/ui/main.qml
+++ b/components/mail/contents/ui/main.qml
@@ -106,7 +106,8 @@ ApplicationWindow {
                 }
 
                 ToolButton {
-                    Layout.fillHeight: true
+                    height: toolbar.height
+                    width: toolbar.width
                     iconName: "view-refresh"
                     text: "Sync"
                     enabled: syncAction.ready
@@ -123,7 +124,8 @@ ApplicationWindow {
                 clip: true
 
                 ToolButton {
-                    Layout.fillHeight: true
+                    height: toolbar.height
+                    width: toolbar.width
                     iconName: "mail-mark-unread"
                     text: "Mark As Read"
                     enabled: markAsReadAction.ready
@@ -133,7 +135,8 @@ ApplicationWindow {
                 }
 
                 ToolButton {
-                    Layout.fillHeight: true
+                    height: toolbar.height
+                    width: toolbar.width
                     iconName: "mail-mark-important"
                     text: "Mark Important"
                     enabled: false
@@ -142,7 +145,8 @@ ApplicationWindow {
                 }
 
                 ToolButton {
-                    Layout.fillHeight: true
+                    height: toolbar.height
+                    width: toolbar.width
                     iconName: "edit-delete"
                     text: "Delete Mail"
                     enabled: deleteAction.ready
@@ -198,7 +202,8 @@ ApplicationWindow {
                 ToolButton {
                     id: newMailButton
 
-                    Layout.fillHeight: true
+                    height: toolbar.height
+                    width: toolbar.width
 
                     iconName: "mail-message-new"
                     text: "Compose"
@@ -208,7 +213,8 @@ ApplicationWindow {
                 }
 
                 ToolButton {
-                    Layout.fillHeight: true
+                    height: toolbar.height
+                    width: toolbar.width
                     iconName: "mail-message-reply"
                     text: "Reply"
                     enabled: replyAction.ready
@@ -218,7 +224,8 @@ ApplicationWindow {
                 }
 
                 ToolButton {
-                    Layout.fillHeight: true
+                    height: toolbar.height
+                    width: toolbar.width
                     iconName: "mail-message-edit"
                     text: "Edit"
                     enabled: editAction.ready
@@ -235,6 +242,7 @@ ApplicationWindow {
                     id: searchBar
 
                     Layout.minimumWidth: Kirigami.Units.gridUnit * 25
+                    height: toolbar.height
 
                     placeholderText: "Search..."
                 }
@@ -242,7 +250,8 @@ ApplicationWindow {
                 ToolButton {
                     id: settingsButton
 
-                    Layout.fillHeight: true
+                    height: toolbar.height
+                    width: toolbar.width
 
                     iconName: "application-menu"
                     text: "Settings"
-- 
cgit v1.2.3