Merge pull request #1 from ronso0/deere_rework_singletons

reduce loading time: pack Decks & Mixer into Singleton
Be-ing · Jan 15, 2017 · 4c029b4 · 4c029b4
2 parents 9b38312 + e2884e9
commit 4c029b4
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/res/skins/Deere/main_decks.xml b/res/skins/Deere/main_decks.xml
@@ -50,9 +50,9 @@
                 <Size>-1,150min</Size>
                 <MaximumSize>-1,230</MaximumSize>
                 <Children>
-                  <Template src="skin:left_gutter.xml"/>
-                  <Template src="skin:mixer.xml"/>
-                  <Template src="skin:right_gutter.xml"/>
+                  <SingletonContainer>
+                    <ObjectName>DecksMixerSingleton</ObjectName>
+                  </SingletonContainer>
                 </Children>
               </WidgetGroup>
 
@@ -82,9 +82,9 @@
                 <Size>-1,155max</Size>
                 <MaximumSize>-1,315</MaximumSize>
                 <Children>
-                  <Template src="skin:left_gutter.xml"/>
-                  <Template src="skin:mixer.xml"/>
-                  <Template src="skin:right_gutter.xml"/>
+                  <SingletonContainer>
+                    <ObjectName>DecksMixerSingleton</ObjectName>
+                  </SingletonContainer>
                 </Children>
               </WidgetGroup>
 
@@ -175,9 +175,9 @@
                 <Size>-1,310min</Size>
                 <MaximumSize>-1,460</MaximumSize>
                 <Children>
-                  <Template src="skin:left_gutter.xml"/>
-                  <Template src="skin:mixer.xml"/>
-                  <Template src="skin:right_gutter.xml"/>
+                  <SingletonContainer>
+                    <ObjectName>DecksMixerSingleton</ObjectName>
+                  </SingletonContainer>
                 </Children>
               </WidgetGroup>
 
@@ -206,9 +206,9 @@
                 <Layout>horizontal</Layout>
                 <MaximumSize>-1,630</MaximumSize>
                 <Children>
-                  <Template src="skin:left_gutter.xml"/>
-                  <Template src="skin:mixer.xml"/>
-                  <Template src="skin:right_gutter.xml"/>
+                  <SingletonContainer>
+                    <ObjectName>DecksMixerSingleton</ObjectName>
+                  </SingletonContainer>
                 </Children>
               </WidgetGroup>
 

diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
@@ -91,6 +91,21 @@
     <SetVariable name="VerticalStretchButtonMaximumSize">20,-1</SetVariable>
     <SetVariable name="VerticalStretchButtonSizePolicy">f,me</SetVariable>
 
+    <SingletonDefinition>
+      <ObjectName>DecksMixerSingleton</ObjectName>
+      <Children>
+        <WidgetGroup>
+          <Layout>horizontal</Layout>
+          <SizePolicy>me,min</SizePolicy>
+          <Children>
+            <Template src="skin:left_gutter.xml"/>
+            <Template src="skin:mixer.xml"/>
+            <Template src="skin:right_gutter.xml"/>
+          </Children>
+        </WidgetGroup>
+      </Children>
+    </SingletonDefinition>
+
     <WidgetGroup>
       <SizePolicy>me,me</SizePolicy>
       <Layout>vertical</Layout>