move Library & samplers expand toggle to the right, fix TreeView marg…

…in (scrollbar offset)
mixxxdj · Nov 26, 2018 · 2f85851 · 2f85851
1 parent 7ccbb49
commit 2f85851
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 22 deletions.
diff --git a/res/skins/Deere/library.xml b/res/skins/Deere/library.xml
@@ -26,13 +26,13 @@
               <WidgetGroup>
                 <Layout>horizontal</Layout>
                 <Children>
+                  <SearchBox>
+                  </SearchBox>
                   <Template src="skin:hide_show_button.xml">
                     <SetVariable name="TooltipId">maximize_library</SetVariable>
                     <SetVariable name="object_name">LibraryToggle</SetVariable>
                     <SetVariable name="control">[Master],maximize_library</SetVariable>
                   </Template>
-                  <SearchBox>
-                  </SearchBox>
                 </Children>
               </WidgetGroup>
               <!-- QSplitter between LibrarySidebar and CoverArt -->

diff --git a/res/skins/Deere/sampler_row.xml b/res/skins/Deere/sampler_row.xml
@@ -5,23 +5,6 @@
     <Layout>horizontal</Layout>
     <Children>
 
-      <WidgetGroup>
-        <ObjectName>SamplerExpandButtonContainer</ObjectName>
-        <Layout>vertical</Layout>
-        <Size>20f,-1me</Size>
-        <Children>
-          <WidgetGroup><Size>0min,3f</Size></WidgetGroup>
-
-          <Template src="skin:hide_show_button.xml">
-            <SetVariable name="object_name">SamplerRowExpandButton</SetVariable>
-            <SetVariable name="control">[Skin],sampler_row_<Variable name="row"/>_expanded</SetVariable>
-          </Template>
-
-          <!-- Push the button up to the top. -->
-          <Template src="skin:spacer_v.xml"/>
-        </Children>
-      </WidgetGroup>
-
       <Template src="skin:sampler.xml">
         <SetVariable name="i"><Variable name="1"/></SetVariable>
       </Template>
@@ -53,6 +36,23 @@
         <SetVariable name="i"><Variable name="8"/></SetVariable>
       </Template>
 
+      <WidgetGroup>
+        <ObjectName>SamplerExpandButtonContainer</ObjectName>
+        <Layout>vertical</Layout>
+        <Size>20f,-1me</Size>
+        <Children>
+          <WidgetGroup><Size>0min,3f</Size></WidgetGroup>
+
+          <Template src="skin:hide_show_button.xml">
+            <SetVariable name="object_name">SamplerRowExpandButton</SetVariable>
+            <SetVariable name="control">[Skin],sampler_row_<Variable name="row"/>_expanded</SetVariable>
+          </Template>
+
+          <!-- Push the button up to the top. -->
+          <Template src="skin:spacer_v.xml"/>
+        </Children>
+      </WidgetGroup>
+
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
@@ -101,7 +101,7 @@
 #Sampler {
   border-style: solid;
   border-color: #222;
-  border-width: 0px 1px;
+  border-width: 0px 2px 0px 0px;
 }
 
 #SamplerMiddleSpacer {
@@ -315,7 +315,7 @@ QHeaderView::down-arrow {
 
 /* library search bar */
 WSearchLineEdit {
-  margin: 0px 0px 0px 1px;
+  margin: 0px 2px 0px 0px;
   padding: 2px;
   border: 1px solid #4B4B4B;
   background-color: #1e1e1e;
@@ -365,7 +365,11 @@ WSearchLineEdit:focus {
 
 /* Spacing between treeview and preview deck/search bar */
 QTreeView {
-  margin: 4px 0px 0px 0px;
+  margin: 0px;
+}
+
+#LibraryCoverArtSplitter {
+  margin-top: 4px;
 }
 
 /* sidebar, as well as root items for playlists, crates, and history */