Merge XML and CSS widgets improvements from https://gitlab.com/inkscape/inkscape/merge_requests/801

2 files changed, 63 insertions, 27 deletions

diff --git a/share/ui/dialog-css.ui b/share/ui/dialog-css.ui
index 6ffcabc71..682df1b93 100644
--- a/share/ui/dialog-css.ui
+++ b/share/ui/dialog-css.ui
@@ -31,10 +31,16 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="CSSSelector">
+          <object class="GtkEventBox" id="CSSSelectorEventBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Selector</property>
+            <child>
+              <object class="GtkLabel" id="CSSSelector">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Selector</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -43,6 +49,17 @@
           </packing>
         </child>
         <child>
+          <object class="GtkEntry" id="CSSEditSelector">
+            <property name="can_focus">True</property>
+            <property name="no_show_all">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
           <object class="GtkLabel">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
@@ -51,7 +68,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="position">4</property>
           </packing>
         </child>
       </object>
@@ -68,7 +85,6 @@
         <property name="has_tooltip">True</property>
         <property name="hscroll_policy">natural</property>
         <property name="vscroll_policy">natural</property>
-        <property name="headers_visible">False</property>
         <property name="enable_search">False</property>
         <property name="fixed_height_mode">True</property>
         <property name="hover_selection">True</property>
diff --git a/share/ui/style.css b/share/ui/style.css
index a7bed5d59..6287a1622 100644
--- a/share/ui/style.css
+++ b/share/ui/style.css
@@ -66,7 +66,7 @@
     * ::::::: Color based
     * ::::::: apply to colors
     * ::::::: scope widget and all his childs
-    * ".invert" invert colors
+    * ".inverted" invert colors
     * :::::::: Icon Based.
     * ".symbolic" Force icon symbolic
     * ".regular" Force colorful icons
@@ -91,37 +91,22 @@ image {
     -gtk-icon-style: regular;
 }
 
-.invert {
-    color: @theme_bg_color;
-    background-color: @theme_fg_color;
-    background-image: image(@theme_fg_color);
-}
-
-.dark .forcebright {
-    color: @theme_bg_color;
-    background-color: @theme_fg_color;
-    background-image: image(@theme_fg_color);
-}
-
+.inverted,
+.dark .forcebright,
 .bright .forcedark {
     color: @theme_bg_color;
     background-color: @theme_fg_color;
     background-image: image(@theme_fg_color);
 }
 
-.invert :not(overshoot):not(undershoot):not(.rawimage) {
-    color: inherit;
-    background-color: inherit;
-}
 
-.dark .forcebright :not(overshoot):not(undershoot):not(.rawimage) {
-    color: inherit;
-    background-color: inherit;
-}
 
-.bright .forcedark :not(overshoot):not(undershoot):not(.rawimage) {
+.inverted :not(menuitem):not(.rawstyle):not(overshoot):not(undershoot):not(selection),
+.bright .forcedark :not(menuitem):not(.rawstyle):not(overshoot):not(undershoot):not(selection),
+.dark .forcebright :not(menuitem):not(.rawstyle):not(overshoot):not(undershoot):not(selection) {
     color: inherit;
     background-color: inherit;
+    background-image: inherit;
 }
 
 .combobright * {
@@ -225,8 +210,8 @@ spinbutton undershoot {
 
 #LPESelectorFlowBox flowboxchild:selected image,
 #LPESelectorFlowBox flowboxchild:selected label {
-    background-color: @theme_selected_bg_color;
     color: @theme_selected_fg_color;
+    background-color: @theme_selected_bg_color;
     background-image: image(@theme_selected_bg_color);
 }
 
@@ -311,6 +296,41 @@ spinbutton undershoot {
     padding-bottom: 0;
 }
 
+#XMLAndAttributesDialog .radio.image-button,
+#SelectorsAndStyleDialog .radio.image-button {
+    margin: 0;
+    padding: 0px;
+    border-radius: 2px 0 0 2px;
+}
+
+#XMLAndAttributesDialog .radio.image-button:last-child,
+#SelectorsAndStyleDialog .radio.image-button:last-child {
+    border-radius: 0 2px 2px 0;
+    border-left-width: 0;
+}
+
+#SelectorsAndStyleDialog treeview button {
+    border-width: 0;
+    margin: 0 0 1px 0;
+}
+
+#SelectorsAndStyleDialog treeview button:nth-child(3),
+#SelectorsAndStyleDialog treeview.style_sheet button:nth-child(4) {
+    border-width: 0 0 0 2px;
+    border-color: @theme_fg_color;
+    border-style: solid;
+    opacity: 0.5;
+}
+
+#SelectorsAndStyleDialog treeview.style_sheet button:nth-child(3) {
+    border-width: 0;
+}
+
+#SelectorsAndStyleDialog treeview button {
+    min-height: 3px;
+    font-size: 1px;
+}
+
 #InkRuler {
     font-size: 7pt;
 }