Improve preset auto-loading

- Allow loading a preset when a window is touching the panel #44
- Now is possible to have assign a preset for all states and they are loaded with the following priority:

1. Normal
2. Floating
3. Touching
4. Maximized

package/contents/config/main.xml

@@ -418,6 +418,11 @@
  type="String">
  <default></default>
  </entry>
+ <entry
+ name="touchingWindowPreset"
+ type="String">
+ <default></default>
+ </entry>
  <entry
  name="maximizedPreset"
  type="String">

package/contents/ui/configPresetAutoload.qml

@@ -16,6 +16,7 @@ KCM.SimpleKCM {
 
  property string cfg_normalPreset
  property string cfg_floatingPreset
+ property string cfg_touchingWindowPreset
  property string cfg_maximizedPreset
 
  ListModel {
@@ -114,6 +115,19 @@ KCM.SimpleKCM {
  }
 
  ColumnLayout {
+ Label {
+ text: i18n("Here you can switch between different panel presets based on the Panel and window states below.")
+ Layout.maximumWidth: root.width - (Kirigami.Units.gridUnit * 2)
+ wrapMode: Text.Wrap
+ Layout.alignment: Qt.AlignHCenter
+ }
+
+ Label {
+ text: i18n("Priorities go from lowest to highest. E.g. if both <b>Maximized window is shown</b> and <b>Panel touching window</b> have a preset selected, and there is a maximized window on the screen, the <b>Maximized</b> preset will be applied.")
+ Layout.maximumWidth: root.width - (Kirigami.Units.gridUnit * 2)
+ wrapMode: Text.Wrap
+ Layout.alignment: Qt.AlignHCenter
+ }
  Kirigami.FormLayout {
 
  ComboBox {
@@ -136,7 +150,17 @@ KCM.SimpleKCM {
  cfg_floatingPreset = model.get(currentIndex)["value"]
  }
  currentIndex: getIndex(model, cfg_floatingPreset)
- enabled: cfg_maximizedPreset === ""
+ }
+
+ ComboBox {
+ id: touchingWindowPreset
+ model: presetsModel
+ textRole: "name"
+ Kirigami.FormData.label: i18n("Window touching panel:")
+ onCurrentIndexChanged: {
+ cfg_touchingWindowPreset = model.get(currentIndex)["value"]
+ }
+ currentIndex: getIndex(model, cfg_touchingWindowPreset)
  }
 
  ComboBox {
@@ -148,7 +172,6 @@ KCM.SimpleKCM {
  cfg_maximizedPreset = model.get(currentIndex)["value"]
  }
  currentIndex: getIndex(model, cfg_maximizedPreset)
- enabled: cfg_floatingPreset === ""
  }
  }
  }

package/contents/ui/main.qml

@@ -230,6 +230,7 @@ PlasmoidItem {
  }) : null
  }
  property bool isFloating: !panelElement ? false : Boolean(panelElement.floatingness)
+ property bool isTouchingWindow: !panelElement ? false : Boolean(panelElement.touchingWindow)
 
  property ContainmentItem containmentItem: null
  readonly property int depth : 14
@@ -252,10 +253,12 @@ PlasmoidItem {
  "objectName",
  "lastPreset",
  "floatingPreset",
+ "touchingWindowPreset",
  "normalPreset",
  "maximizedPreset"
  ]
  property string floatingPreset: plasmoid.configuration.floatingPreset
+ property string touchingWindowPreset: plasmoid.configuration.touchingWindowPreset
  property string normalPreset: plasmoid.configuration.normalPreset
  property string maximizedPreset: plasmoid.configuration.maximizedPreset
  property string lastPreset
@@ -362,24 +365,32 @@ PlasmoidItem {
  plasmoid.configuration.writeConfig();
  }
 
- onIsFloatingChanged: {
- if (floatingPreset === "") return
- console.log("FLOATING:", isFloating);
- if (isFloating) {
+ function switchPreset() {
+ if (maximizedWindowExists && maximizedPreset !== "") {
+ applyPreset(maximizedPreset)
+ return
+ }
+ if (isTouchingWindow && touchingWindowPreset !== "") {
+ applyPreset(touchingWindowPreset)
+ return
+ }
+ if (isFloating && floatingPreset !== "") {
  applyPreset(floatingPreset)
- } else {
- applyPreset(normalPreset)
+ return
  }
+ applyPreset(normalPreset)
+ }
+
+ onIsFloatingChanged: {
+ switchPreset()
+ }
+
+ onIsTouchingWindowChanged: {
+ switchPreset()
  }
 
  onMaximizedWindowExistsChanged: {
- if (maximizedPreset === "") return
- console.log("MAXIMIZED:", maximizedWindowExists);
- if (maximizedWindowExists) {
- applyPreset(maximizedPreset)
- } else {
- applyPreset(normalPreset)
- }
+ switchPreset()
  }
 
  function hexToRgb(hex) {