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

List:       kde-commits
Subject:    [kwin/fredrik/vulkan] kcmkwin/kwincompositing: kcmkwin/compositing: Move the scale method combobox
From:       Fredrik_Höglund <null () kde ! org>
Date:       2018-02-16 17:01:48
Message-ID: E1emjOO-0004Yx-IL () code ! kde ! org
[Download RAW message or body]

Git commit f4f4cfbbb6393df7fb9d41152d90caac61f94f82 by Fredrik Höglund.
Committed on 16/02/2018 at 16:58.
Pushed by fredrik into branch 'fredrik/vulkan'.

kcmkwin/compositing: Move the scale method combobox

Move the scale method combobox below the render backend combobox.

It is not going to be visible when the Vulkan backend is selected,
and this prevents the rendering backend combobox from shifting
vertically when a different backend is selected.

M  +28   -28   kcmkwin/kwincompositing/compositing.ui

https://commits.kde.org/kwin/f4f4cfbbb6393df7fb9d41152d90caac61f94f82

diff --git a/kcmkwin/kwincompositing/compositing.ui b/kcmkwin/kwincompositing/compositing.ui
index f8a8bca86..5e2aff770 100644
--- a/kcmkwin/kwincompositing/compositing.ui
+++ b/kcmkwin/kwincompositing/compositing.ui
@@ -136,14 +136,38 @@ Alternatively, you might want to use the XRender backend instead.</string>
      </item>
     </layout>
    </item>
-   <item row="4" column="0">
+   <item row="4" column="0" colspan="2">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Rendering backend:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QComboBox" name="type"/>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0">
     <widget class="QLabel" name="glScaleFilterLabel">
      <property name="text">
       <string>Scale method:</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
+   <item row="7" column="1">
     <widget class="QComboBox" name="glScaleFilter">
      <item>
       <property name="text">
@@ -162,14 +186,14 @@ Alternatively, you might want to use the XRender backend instead.</string>
      </item>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item row="8" column="0">
     <widget class="QLabel" name="xrScaleFilterLabel">
      <property name="text">
       <string>Scale method:</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
+   <item row="8" column="1">
     <widget class="QComboBox" name="xrScaleFilter">
      <item>
       <property name="text">
@@ -183,30 +207,6 @@ Alternatively, you might want to use the XRender backend instead.</string>
      </item>
     </widget>
    </item>
-   <item row="6" column="0" colspan="2">
-    <widget class="Line" name="line">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Rendering backend:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1">
-    <widget class="QComboBox" name="type"/>
-   </item>
-   <item row="8" column="0" colspan="2">
-    <widget class="Line" name="line_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
    <item row="9" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">

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