Fix scrollbar issue

Scrollbars were clashing between views, causing incorrect focus
kib · Feb 23, 2015 · 360faec · 360faec
1 parent a1a47b5
commit 360faec
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/720p/Viewtype_Files.xml b/720p/Viewtype_Files.xml
@@ -421,6 +421,7 @@
           <onright>500</onright>
           <showonepage>false</showonepage>
           <orientation>vertical</orientation>
+          <visible>Control.IsVisible(500)</visible>
         </control>
       </control>
     </control>

diff --git a/720p/Viewtype_List.xml b/720p/Viewtype_List.xml
@@ -19,11 +19,11 @@
         <width>580</width>
         <height>601</height>
         <onleft>7000</onleft>
-        <onright>5360</onright>
+        <onright>60</onright>
         <onup>53</onup>
         <ondown>53</ondown>
         <viewtype label="$LOCALIZE[31137]">list</viewtype>
-        <pagecontrol>5360</pagecontrol>
+        <pagecontrol>60</pagecontrol>
         <focusposition>7</focusposition>
         <movement>0</movement>
         <scrolltime>200</scrolltime>
@@ -134,7 +134,7 @@
           </control>
         </focusedlayout>
       </control>
-      <control type="scrollbar" id="5360">
+      <control type="scrollbar" id="60">
         <left>1230</left>
         <top>60</top>
         <width>25</width>

diff --git a/720p/Viewtype_List2.xml b/720p/Viewtype_List2.xml
@@ -19,12 +19,12 @@
         <width>580</width>
         <height>401</height>
         <onleft>7000</onleft>
-        <onright>50360</onright>
+        <onright>60</onright>
         <onup>503</onup>
         <ondown>503</ondown>
         <focusposition>4</focusposition>
         <viewtype label="$LOCALIZE[31138]">list</viewtype>
-        <pagecontrol>50360</pagecontrol>
+        <pagecontrol>60</pagecontrol>
         <scrolltime>200</scrolltime>
         <visible>![Window.IsActive(Programs) | Window.IsActive(musicplaylist)]</visible>
         <itemlayout height="40" width="580">
@@ -132,7 +132,7 @@
           </control>
         </focusedlayout>
       </control>
-      <control type="scrollbar" id="50360">
+      <control type="scrollbar" id="60">
         <left>1230</left>
         <top>260</top>
         <width>25</width>

diff --git a/720p/Viewtype_SlimFiles.xml b/720p/Viewtype_SlimFiles.xml
@@ -41,13 +41,13 @@
       <onup>598</onup>
       <ondown>598</ondown>
       <onleft>7000</onleft>
-      <onright>60</onright>
+      <onright>65</onright>
       <scrolltime>0</scrolltime>
       <viewtype label="$LOCALIZE[31134]">list</viewtype>
       <orientation>vertical</orientation>
       <focusposition>2</focusposition>
       <movement>2</movement>
-      <pagecontrol>60</pagecontrol>
+      <pagecontrol>65</pagecontrol>
       <include>Animation_HiddenByInfo</include>
       <include>Animation_Viewtype_Files_LeftArea</include>
       <itemlayout width="1210" height="36">
@@ -728,22 +728,22 @@
       <include>Animation_HiddenByInfo</include>
       <include>Animation_Viewtype_Wall_Fags</include>
     </control>
-    <control type="scrollbar" id="60">
+    <control type="scrollbar" id="65">
       <include>Animation_ZoomInZoomOut</include>
       <left>1280</left>
       <top>100</top>
       <width>25</width>
       <height>460</height>
-      <visible allowhiddenfocus="true">Control.IsVisible(598) + Control.HasFocus(60)</visible>
+      <visible allowhiddenfocus="true">Control.IsVisible(598) + Control.HasFocus(65)</visible>
       <texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
       <textureslidernibfocus>ScrollBarV_Nib_Focus.png</textureslidernibfocus>
-      <onleft>50</onleft>
-      <onright>50</onright>
+      <onleft>598</onleft>
+      <onright>598</onright>
       <showonepage>true</showonepage>
       <orientation>vertical</orientation>
       <include>Animation_CommonFade</include>
-      <animation effect="slide" start="0,0" end="-500,0" time="400" tween="cubic" easing="inout" condition="Control.HasFocus(60) + ![Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)]">Conditional</animation>
-      <animation effect="slide" start="0,0" end="-530,0" time="400" tween="cubic" easing="inout" condition="Control.HasFocus(60) + [Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)]">Conditional</animation>
+      <animation effect="slide" start="0,0" end="-500,0" time="400" tween="cubic" easing="inout" condition="Control.HasFocus(65) + ![Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)]">Conditional</animation>
+      <animation effect="slide" start="0,0" end="-530,0" time="400" tween="cubic" easing="inout" condition="Control.HasFocus(65) + [Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)]">Conditional</animation>
     </control>
   </include>
 </includes>