[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [mauikit] src/controls: fixes on piebutton toolbar and toolbutton
From:       Camilo Higuita <null () kde ! org>
Date:       2018-09-28 21:43:08
Message-ID: E1g60XU-000085-LO () code ! kde ! org
[Download RAW message or body]

Git commit 544417ea9bb7be1901a7329981af8bf7913b3a4c by Camilo Higuita.
Committed on 28/09/2018 at 20:20.
Pushed by camiloh into branch 'master'.

fixes on piebutton toolbar and toolbutton

M  +3    -1    src/controls/PieButton.qml
M  +1    -1    src/controls/ToolBar.qml
M  +5    -0    src/controls/ToolButton.qml

https://commits.kde.org/mauikit/544417ea9bb7be1901a7329981af8bf7913b3a4c

diff --git a/src/controls/PieButton.qml b/src/controls/PieButton.qml
index c24a3e3..ce0aeae 100644
--- a/src/controls/PieButton.qml
+++ b/src/controls/PieButton.qml
@@ -36,7 +36,8 @@ Maui.ToolButton
 		id: popup
 		height: barHeight
 		width: content.middleLayout.implicitWidth + space.big > maxWidth ? maxWidth : \
(content.middleLayout.implicitWidth > ApplicationWindow.overlay.width ? \
                ApplicationWindow.overlay.width  : content.middleLayout.implicitWidth \
                + space.big)		
-		
+		padding: 0
+		margins: 0
 		x: (control.x - width) - space.big
 		y:  parent.height / 2 - height / 2
 		
@@ -62,6 +63,7 @@ Maui.ToolButton
 		{
 			id: content
 			anchors.fill: parent
+			implicitHeight: parent.height
 			spacing: space.enormous
 			colorScheme.backgroundColor: "transparent"
 		}
diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml
index 50e9875..25e7e89 100644
--- a/src/controls/ToolBar.qml
+++ b/src/controls/ToolBar.qml
@@ -48,7 +48,7 @@ ToolBar
     property alias layout : layout
     
     property int margins: space.medium
-    spacing: space.medium
+    spacing: space.big
     property int count : leftContent.length + middleContent.length + \
rightContent.length  
     property bool dropShadow: false
diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml
index a55074b..44cbeb0 100644
--- a/src/controls/ToolButton.qml
+++ b/src/controls/ToolButton.qml
@@ -46,6 +46,11 @@ ToolButton
 	
     hoverEnabled: !isMobile
     
+   implicitWidth: Math.max(background ? background.implicitWidth : 0,
+                            contentItem.implicitWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(background ? background.implicitHeight : 0,
+                             contentItem.implicitHeight + topPadding + \
bottomPadding) +    
     height: control.display === ToolButton.IconOnly ? size + space.medium : \
                implicitHeight
     width: control.display === ToolButton.IconOnly ? height : implicitWidth
     


[prev in list] [next in list] [prev in thread] [next in thread]