From c1c5eb221913dd7ce7538ef9d4120f7b69866729 Mon Sep 17 00:00:00 2001
From: Diego Prado Gesto <d.pradogesto@ultimaker.com>
Date: Wed, 28 Nov 2018 09:44:37 +0100
Subject: [PATCH] Rename the properties to quickly identify that they are a
 boolean

Contributes to CURA-5984.
---
 resources/qml/Toolbar.qml       |  8 ++++----
 resources/qml/ToolbarButton.qml | 12 ++++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/resources/qml/Toolbar.qml b/resources/qml/Toolbar.qml
index 0207c8ec49..d16f949014 100644
--- a/resources/qml/Toolbar.qml
+++ b/resources/qml/Toolbar.qml
@@ -61,8 +61,8 @@ Item
                     checked: model.active
                     enabled: model.enabled && UM.Selection.hasSelection && UM.Controller.toolsEnabled
 
-                    topElement: toolsModel.getItem(0).id == model.id
-                    bottomElement: toolsModel.getItem(toolsModel.rowCount() - 1).id == model.id
+                    isTopElement: toolsModel.getItem(0).id == model.id
+                    isBottomElement: toolsModel.getItem(toolsModel.rowCount() - 1).id == model.id
 
                     toolItem: UM.RecolorImage
                     {
@@ -137,8 +137,8 @@ Item
                 delegate: ExtruderButton
                 {
                     extruder: model
-                    topElement: extrudersModel.getItem(0).id == model.id
-                    bottomElement: extrudersModel.getItem(extrudersModel.rowCount() - 1).id == model.id
+                    isTopElement: extrudersModel.getItem(0).id == model.id
+                    isBottomElement: extrudersModel.getItem(extrudersModel.rowCount() - 1).id == model.id
                 }
             }
         }
diff --git a/resources/qml/ToolbarButton.qml b/resources/qml/ToolbarButton.qml
index b5e5aab475..9e81939ba2 100644
--- a/resources/qml/ToolbarButton.qml
+++ b/resources/qml/ToolbarButton.qml
@@ -12,8 +12,12 @@ Button
     id: base
 
     property alias toolItem: contentItemLoader.sourceComponent
-    property bool topElement: false
-    property bool bottomElement: false
+
+    // These two properties indicate whether the toolbar button is at the top of the toolbar column or at the bottom.
+    // If it is somewhere in the middle, then both has to be false. If there is only one element in the column, then
+    // both properties have to be set to true. This is used to create a rounded corner.
+    property bool isTopElement: false
+    property bool isBottomElement: false
 
     hoverEnabled: true
 
@@ -49,7 +53,7 @@ Button
                 top: parent.top
             }
             height: parent.radius
-            color: base.topElement ? "transparent" : parent.color
+            color: base.isTopElement ? "transparent" : parent.color
         }
 
         Rectangle
@@ -62,7 +66,7 @@ Button
                 bottom: parent.bottom
             }
             height: parent.radius
-            color: base.bottomElement ? "transparent" : parent.color
+            color: base.isBottomElement ? "transparent" : parent.color
         }
 
         Rectangle