Repository: flxzt/rnote (language: rust)

Issue:
Order of shaper tool option
The tool “Shape builders” button should be on the top.
Because the most far-reaching setting is what i want to draw.
All the other options are just attributes of the shape.

The Constraints are pretty shape independent and should not be clustered with the Shape builders (and should have their own icon).


Discussion / hints:

Fix patch:
diff --git a/AUTHORS b/AUTHORS
index 46e73b833e..1a3edb06e0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,3 +2,4 @@ Felix Zwettler
 Óscar Fernández Díaz
 Seio Inoue
 Moritz Mechelk
+PhilProg
\ No newline at end of file
diff --git a/crates/rnote-ui/data/ui/penssidebar/shaperpage.ui b/crates/rnote-ui/data/ui/penssidebar/shaperpage.ui
index acd033d4ba..a7da39c778 100644
--- a/crates/rnote-ui/data/ui/penssidebar/shaperpage.ui
+++ b/crates/rnote-ui/data/ui/penssidebar/shaperpage.ui
@@ -12,12 +12,13 @@
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
+        <property name="vexpand">false</property>
         <child>
-          <object class="GtkMenuButton" id="shaperstyle_menubutton">
+          <object class="GtkMenuButton" id="shapebuildertype_menubutton">
             <property name="direction">left</property>
-            <property name="tooltip_text" translatable="yes">Shaper Style</property>
-            <property name="popover">shaperstyle_popover</property>
-            <property name="icon-name">pen-shaper-style-smooth-symbolic</property>
+            <property name="tooltip_text" translatable="yes">Shape Builders</property>
+            <property name="popover">shapebuildertype_popover</property>
+            <property name="icon-name">shapebuilder-line-symbolic</property>
             <style>
               <class name="flat" />
               <class name="sidebar_action_button" />
@@ -25,11 +26,14 @@
           </object>
         </child>
         <child>
-          <object class="GtkMenuButton" id="shapeconfig_menubutton">
+          <object class="GtkMenuButton" id="constraint_menubutton">
             <property name="icon-name">settings-symbolic</property>
+            <property name="hexpand">true</property>
+            <property name="sensitive">true</property>
+            <property name="halign">fill</property>
             <property name="direction">left</property>
-            <property name="tooltip_text" translatable="yes">Shape Configuration</property>
-            <property name="popover">shapeconfig_popover</property>
+            <property name="tooltip_text" translatable="yes">Constraints</property>
+            <property name="popover">constraint_popover</property>
             <style>
               <class name="flat" />
             </style>
@@ -54,13 +58,12 @@
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
-        <property name="vexpand">false</property>
         <child>
-          <object class="GtkMenuButton" id="shapebuildertype_menubutton">
+          <object class="GtkMenuButton" id="shaperstyle_menubutton">
             <property name="direction">left</property>
-            <property name="tooltip_text" translatable="yes">Shape Builders</property>
-            <property name="popover">shapebuildertype_popover</property>
-            <property name="icon-name">shapebuilder-line-symbolic</property>
+            <property name="tooltip_text" translatable="yes">Shaper Style</property>
+            <property name="popover">shaperstyle_popover</property>
+            <property name="icon-name">pen-shaper-style-smooth-symbolic</property>
             <style>
               <class name="flat" />
               <class name="sidebar_action_button" />
@@ -68,14 +71,11 @@
           </object>
         </child>
         <child>
-          <object class="GtkMenuButton" id="constraint_menubutton">
+          <object class="GtkMenuButton" id="shapeconfig_menubutton">
             <property name="icon-name">settings-symbolic</property>
-            <property name="hexpand">true</property>
-            <property name="sensitive">true</property>
-            <property name="halign">fill</property>
             <property name="direction">left</property>
-            <property name="tooltip_text" translatable="yes">Constraints</property>
-            <property name="popover">constraint_popover</property>
+            <property name="tooltip_text" translatable="yes">Shape Configuration</property>
+            <property name="popover">shapeconfig_popover</property>
             <style>
               <class name="flat" />
             </style>
@@ -370,4 +370,4 @@ when this switch is off/on</property>
       </child>
     </object>
   </template>
-</interface>
\ No newline at end of file
+</interface>


Test patch: