commit problems

TeroStyle/ComboBox.qml

@@ -2,16 +2,14 @@ import QtQuick
 import QtQuick.Templates as T
 import QtQuick.Controls
 
-T.ComboBox
-    {
+T.ComboBox {
     id: control
 
     font: Typography.body
     implicitHeight: background.height
     padding: Dimensions.m
 
-    background: Rectangle
-    {
+    background: Rectangle {
         border.color: Colors.interactive
         border.width: 1
         color: Colors.mantle
@@ -35,22 +33,6 @@ T.ComboBox
         required property int index
         required property var model
 
-<<<<<<< HEAD
-    delegate: T.ItemDelegate
-    {
-        width: control.width
-        height: implicitContentHeight + topPadding + bottomPadding
-        padding: Dimensions.s
-        leftPadding: control.leftPadding
-        contentItem: Label
-        {
-            text: control.textRole ? model[control.textRole] : modelData
-            color: Colors.foreground
-            elide: Text.ElideRight
-            verticalAlignment: Text.AlignVCenter
-        }
-=======
->>>>>>> main
         highlighted: control.highlightedIndex === index
         hoverEnabled: control.hoverEnabled
         text: model[control.textRole]
@@ -62,13 +44,7 @@ T.ComboBox
             width: menuItem.width
         }
     }
-<<<<<<< HEAD
-    indicator: Label
-    {
-        x: control.width - width
-=======
     indicator: Label {
->>>>>>> main
         height: control.height
         horizontalAlignment: Text.AlignHCenter
         padding: Dimensions.s
@@ -77,12 +53,7 @@ T.ComboBox
         width: contentWidth + Dimensions.s * 2
         x: control.width - width
 
-<<<<<<< HEAD
-        background:  Rectangle
-        {
-=======
         background: Rectangle {
->>>>>>> main
             anchors.fill: parent
             border.color: Colors.interactive
             bottomRightRadius: Dimensions.radius
@@ -90,16 +61,6 @@ T.ComboBox
             topRightRadius: Dimensions.radius
         }
     }
-<<<<<<< HEAD
-
-    popup: T.Popup
-    {
-        y: control.height
-        z: 2
-        width: control.width
-        contentItem: ListView
-        {
-=======
     popup: T.Popup {
         width: control.width
         height: Math.min(contentItem.implicitHeight + 2, control.Window.height - topMargin - bottomMargin)
@@ -113,7 +74,6 @@ T.ComboBox
             radius: Dimensions.radius
         }
         contentItem: ListView {
->>>>>>> main
             clip: true
             currentIndex: control.highlightedIndex
             implicitHeight: contentHeight
@@ -121,23 +81,10 @@ T.ComboBox
             
             T.ScrollBar.vertical: ScrollBar { }
 
-            highlight: Rectangle
-            {
+            highlight: Rectangle {
                 color: Colors.primary
                 opacity: Colors.highlightOpacity
             }
-<<<<<<< HEAD
-
-            ScrollIndicator.vertical: ScrollIndicator {}
-        }
-
-        background: Rectangle
-        {
-            color: Colors.mantle
-            border.color: Colors.interactive
-            radius: Dimensions.radius
-=======
->>>>>>> main
         }
     }
 }