Fix TopToolbar and add NonClientControls

ZuneModdingHelper/Controls/NONCLIENTCONTROLS.UIX

@@ -0,0 +1,339 @@
+<!-- Copyright (C) Microsoft Corporation. All rights reserved. -->
+<UIX xmlns="http://schemas.microsoft.com/2007/uix"
+  xmlns:iris="assembly://UIX/Microsoft.Iris"
+  xmlns:istyles="clr-res://IrisShell!Controls.Styles.uix"
+  xmlns:me="Me">
+
+  
+
+  <UI Name="WindowResizeBorderLayer">
+    <Scripts>
+      <Script>
+        istyles:WindowState.ResizeBorderInputActivity = UI.MouseFocus;
+      </Script>
+    </Scripts>
+
+    <Content>
+      <Panel Layout="Anchor">
+        <Children>
+
+           <me:WindowSizer Name="SizerNW" Mode="{me:WindowSizerModes.NW}">
+             <LayoutInput>
+               <AnchorLayoutInput Top="Parent,0" Left="Parent,0"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerNE" Mode="{me:WindowSizerModes.NE}">
+             <LayoutInput>
+               <AnchorLayoutInput Top="Parent,0" Right="Parent,1"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerSE" Mode="{me:WindowSizerModes.SE}">
+             <LayoutInput>
+               <AnchorLayoutInput Bottom="Parent,1" Right="Parent,1"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerSW" Mode="{me:WindowSizerModes.SW}">
+             <LayoutInput>
+               <AnchorLayoutInput Bottom="Parent,1" Left="Parent,0"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerN" Mode="{me:WindowSizerModes.N}">
+             <LayoutInput>
+               <AnchorLayoutInput Left="SizerNW,1" Right="SizerNE,0" Top="Parent,0"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerS" Mode="{me:WindowSizerModes.S}">
+             <LayoutInput>
+               <AnchorLayoutInput Left="SizerSW,1" Right="SizerSE,0" Bottom="Parent,1"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerE" Mode="{me:WindowSizerModes.E}">
+             <LayoutInput>
+               <AnchorLayoutInput Top="SizerNE,1" Bottom="SizerSE,0" Right="Parent,1"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+           <me:WindowSizer Name="SizerW" Mode="{me:WindowSizerModes.W}">
+             <LayoutInput>
+               <AnchorLayoutInput Top="SizerNW,1" Bottom="SizerSW,0" Left="Parent,0"/>
+             </LayoutInput>
+           </me:WindowSizer>
+
+        </Children>
+      </Panel>
+    </Content>
+  </UI>
+
+  
+
+  <Class Name="WindowSizerMode">
+    <Properties>
+      <Cursor  Name="Cursor" Cursor="$Required"/>
+      <Boolean Name="MoveN"  Boolean="false"/>
+      <Boolean Name="MoveS"  Boolean="false"/>
+      <Boolean Name="MoveE"  Boolean="false"/>
+      <Boolean Name="MoveW"  Boolean="false"/>
+    </Properties>
+  </Class>
+
+  <Class Name="WindowSizerModes" Shared="true">
+    <Properties>
+      <me:WindowSizerMode Name="N"  Cursor="{Cursor.SizeNS}"   MoveN="true" />
+      <me:WindowSizerMode Name="S"  Cursor="{Cursor.SizeNS}"   MoveS="true" />
+      <me:WindowSizerMode Name="E"  Cursor="{Cursor.SizeWE}"   MoveE="true" />
+      <me:WindowSizerMode Name="W"  Cursor="{Cursor.SizeWE}"   MoveW="true" />
+      <me:WindowSizerMode Name="NE" Cursor="{Cursor.SizeNESW}" MoveN="true" MoveE="true" />
+      <me:WindowSizerMode Name="SE" Cursor="{Cursor.SizeNWSE}" MoveS="true" MoveE="true" />
+      <me:WindowSizerMode Name="NW" Cursor="{Cursor.SizeNWSE}" MoveN="true" MoveW="true" />
+      <me:WindowSizerMode Name="SW" Cursor="{Cursor.SizeNESW}" MoveS="true" MoveW="true" />
+    </Properties>
+  </Class>
+
+  <UI Name="WindowSizer">
+
+    <Properties>
+      <Size Name="Size" Size="8,8"/>
+      <me:WindowSizerMode Name="Mode" WindowSizerMode="$Required"/>
+    </Properties>
+
+    <Locals>
+      <iris:WindowPosition Name="InitialPosition"/>
+      <iris:WindowSize Name="InitialSize"/>
+    </Locals>
+
+    <Input>
+      <DragHandler Name="Dragger" CancelOnEscape="true"/>
+    </Input>
+
+    <Scripts>
+
+      <Script>
+        [DeclareTrigger(iris:Application.Window.WindowState)]
+        [InitialEvaluate(true)]
+
+        
+        
+
+        if (iris:Application.Window.WindowState == iris:WindowState.Maximized)
+        {
+           UI.Cursor = Cursor.NotSpecified;
+           Dragger.DragCursor = Cursor.NotSpecified;
+        }
+        else
+        {
+           UI.Cursor = Mode.Cursor;
+           Dragger.DragCursor = Mode.Cursor;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.Started)]
+        
+        
+
+        InitialPosition = iris:Application.Window.Position;
+        InitialSize = iris:Application.Window.ClientSize;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.Canceled)]
+
+        
+        
+
+        iris:Application.Window.Position = InitialPosition;
+        iris:Application.Window.ClientSize = InitialSize;
+      </Script>
+
+      <!--May be LocalDragSize-->
+      <Script><![CDATA[
+        [DeclareTrigger(Dragger.ScreenDragSize)]
+
+        
+
+        if (iris:Application.Window.WindowState == iris:WindowState.Maximized)
+        {
+           return;
+        }
+
+        
+        
+
+        
+        
+        
+        
+        int cxMin = 734;
+        int cyMin = 500;
+
+        int dx = Dragger.ScreenDragSize.Width;
+        int dy = Dragger.ScreenDragSize.Height;
+        int x  = InitialPosition.X;
+        int y  = InitialPosition.Y;
+        int cx = InitialSize.Width;
+        int cy = InitialSize.Height;
+
+        
+        
+
+        if ( Mode.MoveN )
+        {
+           cy = cy - dy;
+           y  = y + dy;
+        }
+        else if ( Mode.MoveS )
+        {
+           cy = cy + dy;
+        }
+
+        
+        
+
+        if ( cy < cyMin )
+        {
+           cy = cyMin;
+
+           if ( Mode.MoveN )
+           {
+              y = (InitialPosition.Y + InitialSize.Height) - cyMin;
+           }
+        }
+
+        
+        
+
+        if ( Mode.MoveW )
+        {
+           cx = cx - dx;
+           x  = x + dx;
+        }
+        else if ( Mode.MoveE )
+        {
+           cx = cx + dx;
+        }
+
+        
+        
+
+        if ( cx < cxMin )
+        {
+           cx = cxMin;
+
+           if ( Mode.MoveW )
+           {
+              x = (InitialPosition.X + InitialSize.Width) - cxMin;
+           }
+        }
+
+        
+
+        iris:WindowSize currentSize = iris:Application.Window.ClientSize;
+
+        if ( cx != currentSize.Width || cy != currentSize.Height )
+        {
+           iris:Application.Window.ClientSize = new iris:WindowSize(cx,cy);
+        }
+
+        
+
+        iris:WindowPosition currentPosition  = iris:Application.Window.Position;
+
+        if ( x != currentPosition.X || y != currentPosition.Y )
+        {
+          iris:Application.Window.Position = new iris:WindowPosition(x,y);
+        }
+
+      ]]></Script>
+
+    </Scripts>
+
+    <Content>
+        <Panel Background="Transparent" Name="Block" MinimumSize="{Size}"/>
+    </Content>
+  </UI>
+
+  
+
+  <UI Name="WindowCaption">
+    <Locals>
+      <iris:WindowPosition Name="InitialPosition"/>
+    </Locals>
+
+    <Input>
+      <DragHandler Name="Dragger" CancelOnEscape="true"/>
+      <ClickHandler Name="Clicker" ClickCount="Double" ClickType="LeftMouse"/>
+    </Input>
+
+    <Scripts>
+
+      <Script>
+        istyles:WindowState.CaptionInputActivity = UI.MouseFocus;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.Started)]
+        
+
+        InitialPosition = iris:Application.Window.Position;
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Clicker.Invoked)]
+
+        
+        
+
+        if ( iris:Application.Window.WindowState == iris:WindowState.Maximized )
+        {
+           iris:Application.Window.WindowState = iris:WindowState.Normal;
+        }
+        else
+        {
+           iris:Application.Window.WindowState = iris:WindowState.Maximized;
+        }
+      </Script>
+
+      <Script>
+        [DeclareTrigger(Dragger.Canceled)]
+
+        
+        
+
+        iris:Application.Window.Position = InitialPosition;
+      </Script>
+
+      <Script><![CDATA[
+        [DeclareTrigger(Dragger.ScreenDragSize)]
+
+        
+
+        if (iris:Application.Window.WindowState == iris:WindowState.Maximized)
+        {
+           return;
+        }
+
+        
+
+        iris:WindowPosition pos = new iris:WindowPosition(
+           InitialPosition.X + Dragger.ScreenDragSize.Width,
+           InitialPosition.Y + Dragger.ScreenDragSize.Height
+        );
+
+        iris:Application.Window.Position = pos;
+      ]]></Script>
+
+    </Scripts>
+
+    <Content>
+      <Panel Background="Transparent" Name="Block"/>
+    </Content>
+  </UI>
+
+</UIX>
+

ZuneModdingHelper/Controls/TOPTOOLBAR.UIX

@@ -3,23 +3,23 @@
   xmlns:sys="assembly://mscorlib/System"
   xmlns:iris="assembly://UIX/Microsoft.Iris"
   xmlns:isui="assembly://IrisShell/IrisShell.UI"
-  xmlns:zcfg="assembly://ZuneDBApi/Microsoft.Zune.Configuration"
-  xmlns:zuneutil="assembly://ZuneShell/Microsoft.Zune.Util"
-  xmlns:zuneutilapi="assembly://ZuneDBApi/Microsoft.Zune.Util"
+  xmlns:istyles="clr-res://IrisShell!Controls.Styles.uix"
+  xmlns:ianim="clr-res://IrisShell!Controls.Animations.uix"
+  xmlns:images="clr-res://IrisShell!Controls.ImageStyle.uix"
+  xmlns:scroll="clr-res://IrisShell!Controls.ScrollBar.uix"
+  xmlns:animations="clr-res://IrisShell!Controls.Animations.uix"
+  xmlns:nonclient="clr-res://ZuneModdingHelper!Controls.NonClientControls.uix"
   xmlns:styles="res://UIXControls!Styles.uix"
   xmlns:style="res://UIXControls!Style.uix"
-  xmlns:menu="res://ZuneShellResources!ContextMenu.uix"
-  xmlns:images="res://UIXControls!ImageStyle.uix"
   xmlns:core="res://UIXControls!Controls.uix"
-  xmlns:nonclient="res://ZuneShellResources!NonClientControls.uix"
-  xmlns:anim="res://UIXControls!Animations.uix"
   xmlns:button="res://UIXControls!Button.uix"
-  xmlns:msgdata="res://ZuneShellResources!MessagingData.schema.xml"
-  xmlns:animations="res://UIXControls!Animations.uix"
-  xmlns:listcore="res://ZuneShellResources!ContentList.uix"
-  xmlns:scroll="res://UIXControls!ScrollBar.uix"
+  xmlns:listcore="res://UIXControls!ContentList.uix"
   xmlns:me="Me">
 
+  <!--
+  xmlns:menu="clr-res://IrisShell!Controls.ContextMenu.uix"
+  -->
+
   
   <UI Name="TopToolbar">
     <Properties>
@@ -49,7 +49,7 @@
           <iris:Command Description="{isui:Shell.LoadString(&quot;IDS_FRAME_SIZE_TOOLTIP&quot;)}" Available="false" />
           <iris:Command Command="{MinimizeCommand}" />
           <iris:Command Command="{MaximizeCommand}" />
-          <menu:MenuDivider />
+          <!--<menu:MenuDivider />-->
           <iris:Command Command="{CloseCommand}" />
         </Options>
       </core:ContextMenu>
@@ -94,25 +94,25 @@
         if (Shell.CurrentFrame != null)
           TopPivot.Content = Shell.CurrentFrame.Experiences.Options;
       </Script>
-      <Script>
+      <!--<Script>
         if (Shell.CurrentExperience != null)
           BottomPivot.Content = Shell.CurrentExperience.Nodes.Options;
       </Script>
 
       <Script>
         BottomPivot.Visible = !Shell.PivotMismatch;
-      </Script>
+      </Script>-->
 
-      <Script>
+      <!--<Script>
         [DeclareTrigger(SettingsButtonModel.Invoked)]
         Page.InvokeSettings();
-      </Script>
+      </Script>-->
       
       
       <Script>
         Page = Shell.CurrentPage;
 
-        SearchBox.Visible = Page.ShowSearch;
+        //SearchBox.Visible = Page.ShowSearch;
         SettingsButton.Visible = Page.ShowSettings;
         SettingsSeparator.Visible = Page.ShowSettings;
         SignInSeparator.Visible = Page.ShowSettings;  
@@ -154,7 +154,7 @@
       </Script>
 
       <Script>
-        styles:WindowState.TopToolbarInputActivity = UI.DeepMouseFocus;
+        istyles:WindowState.TopToolbarInputActivity = UI.MouseFocus;
       </Script>
 
       <Script>
@@ -170,7 +170,7 @@
 
         SysMenu.LayoutInput = new PopupLayoutInput();
         SysMenu.LayoutInput.Placement = PlacementMode.MouseOrigin;
-        SysMenu.Helper.Show(SysMenu);
+        //SysMenu.Helper.Show(SysMenu);
       </Script>
 
       
@@ -181,7 +181,7 @@
         SysMenu.LayoutInput.Offset = new Point(0,2);
         SysMenu.LayoutInput.Placement = PlacementMode.Bottom;
         SysMenu.LayoutInput.PlacementTarget = Logo;
-        SysMenu.Helper.Show(SysMenu);
+        //SysMenu.Helper.Show(SysMenu);
       </Script>
 
       
@@ -220,7 +220,7 @@
               
               <me:Pivot Name="TopPivot"
                   FocusOrder="2"
-                  OverrideStyle="{styles:SharedStyles.TopPivot}"
+                  OverrideStyle="{istyles:SharedStyles.TopPivot}"
                   ItemAnimation="{null}">
                 <ListLayout>
                   <FlowLayout Orientation="Horizontal" Spacing="18,0"/>
@@ -232,21 +232,21 @@
               </me:Pivot>
 
               
-              <me:Pivot Name="BottomPivot"
+              <!--<me:Pivot Name="BottomPivot"
                   FocusOrder="1"
-                  OverrideStyle="{styles:SharedStyles.BottomPivot}"
+                  OverrideStyle="{istyles:SharedStyles.BottomPivot}"
                   ListItemType="{typeof(me:BottomPivotLabelListItem)}"
                   Margins="{me:Constants.OverlapMargins}">
                 <ListLayout>
                   <FlowLayout Orientation="Horizontal" Spacing="15,0"/>
                 </ListLayout>
-              </me:Pivot>
+              </me:Pivot>-->
 
             </Children>
           </Panel>
 
           
-          <me:SearchBox Name="SearchBox" Shell="{Shell}" FocusOrder="5">
+          <!--<me:SearchBox Name="SearchBox" Shell="{Shell}" FocusOrder="5">
             <LayoutInput>
               <FormLayoutInput Right="Parent,1,-55" Left="Parent,1,-239" Top="Parent,0,41" Bottom="Parent,0,67"/>
             </LayoutInput>
@@ -259,21 +259,21 @@
                 </Keyframes>
               </Animation>
             </Animations>
-          </me:SearchBox>
+          </me:SearchBox>-->
 
           <Panel Name="WindowControlContainer" Layout="HorizontalFlow">
             <LayoutInput>
               <FormLayoutInput Right="Parent,1" Top="Parent,0"/>
             </LayoutInput>
             <Children>
-              
-              <ColorFill Name="SignInSeparator" Content="{styles:SharedStyles.SettingsButtonStyle.Default.Color}" MinimumSize="1,9" Margins="0,15,10,0"/>
+
+                <Panel Name="SignInSeparator" Background="{istyles:SharedStyles.SettingsButtonStyle.Default.Color}" MinimumSize="1,9" Margins="0,15,10,0"/>
               
               
-              <core:Button Name="SettingsButton" OverrideStyle="{styles:SharedStyles.SettingsButtonStyle}"  Model="{SettingsButtonModel}" FocusOrder="4" Margins="0,12,10,0" />       
+              <core:Button Name="SettingsButton" OverrideStyle="{istyles:SharedStyles.SettingsButtonStyle}"  Model="{SettingsButtonModel}" FocusOrder="4" Margins="0,12,10,0" />       
               
               
-              <ColorFill Name="SettingsSeparator" Content="{styles:SharedStyles.SettingsButtonStyle.Default.Color}" MinimumSize="1,9" Margins="0,15,7,0"/>
+              <Panel Name="SettingsSeparator" Background="{istyles:SharedStyles.SettingsButtonStyle.Default.Color}" MinimumSize="1,9" Margins="0,15,7,0"/>
 
               
               <me:WindowControls 
@@ -288,7 +288,7 @@
 
           
           
-          <nonclient:WindowCaption Name="Caption" Layout="Fill" MaximumSize="0,70">
+          <nonclient:WindowCaption Name="Caption" Layout="Default" MaximumSize="0,70">
             <LayoutInput>
               <FormLayoutInput Left="Parent,0" Top="Parent,0"/>
             </LayoutInput>
@@ -314,9 +314,8 @@
       <Script>
         [DeclareTrigger(HelpCommand.Invoked)]
         
-        string helpPath = "Help\" + isui:Shell.LoadString(&quot;IDS_ZUNECLIENT_LOCALE&quot;) + "\LandingPage.htm";
+        string helpPath = "Help\\" + isui:Shell.LoadString(&quot;IDS_ZUNECLIENT_LOCALE&quot;) + "\\LandingPage.htm";
         isui:Shell.DefaultInstance.Execute(helpPath, null);
-        zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.HelpClicks, 1);        
       </Script>
 
       <Script>
@@ -393,20 +392,19 @@
       <EditableTextData Name="SearchBoxModel" Value=""/>
     </Properties>
     
-    <Scripts>
+    <!--<Scripts>
       <Script>
         [DeclareTrigger(SearchButton.Invoked)]
         [DeclareTrigger(SearchBoxModel.Submitted)]
         if ( isui:Search.Instance.IsValidKeyword(SearchBoxModel.Value) )
         {
-          zuneutil:SQMLog.Log(zuneutilapi:SQMDataId.SearchExecuted, 1);
           isui:Search.Instance.Execute(SearchBoxModel.Value);
           Shell.SearchButton.Invoke();
         }
       </Script>
 
       <Script>
-        if (UI.DeepKeyFocus)
+        if (UI.DirectKeyFocus)
         {
           SearchBoxBackground.Content = styles:Styles.SearchBoxBackgroundImageActive;
         }
@@ -426,7 +424,7 @@
         [DeclareTrigger(isui:Search.Instance.SearchFocusHotkey.Invoked)]
         SearchEditBox.NavigateInto(); 
       </Script>
-    </Scripts>
+    </Scripts>-->
     
     <Content>
       <Panel Layout="Anchor">
@@ -471,7 +469,7 @@
       <EditableTextData Name="Model" EditableTextData="$Required"/>
 
       
-      <style:Style Name="Style" Style="{styles:SharedStyles.SearchEditBoxStyle}"/>
+      <style:Style Name="Style" Style="{istyles:SharedStyles.SearchEditBoxStyle}"/>
       <Color Name="TextFocusedColor" Color="{styles:Styles.EditTextFocusedForeground}"/>
       <Color Name="TextHighlightColor" Color="{styles:Styles.EditTextFocusedBackground}"/>
 
@@ -484,7 +482,7 @@
     <Scripts>
       <Script>
         <![CDATA[
-        Overlay.Visible = (!UI.DeepKeyFocus && String.IsNullOrEmpty(Model.Value));
+        Overlay.Visible = (!UI.DirectKeyFocus && String.IsNullOrEmpty(Model.Value));
         ]]>
       </Script>
     </Scripts>
@@ -520,7 +518,7 @@
           <core:Editbox Name="SearchEditBox" Model="{Model}" AccessibleDescription="{isui:Shell.LoadString(&quot;IDS_SEARCH_STARTER_TEXT&quot;)}"  Style="{Style}" TextFocusedColor="{TextFocusedColor}"
                 TextHighlightColor="{TextHighlightColor}" TilePadding="{TilePadding}" TileMinSize="{TileMinSize}"
                 TileMaxSize="{TileMaxSize}" BackgroundColor="{styles:Styles.SearchBoxBackground}"
-                BackgroundColorFocus="{styles:Styles.SearchBoxBackgroundActive}"/>
+                BackgroundColorFocus="{istyles:Styles.SearchBoxBackgroundActive}"/>
 
         </Children>
       </Panel>
@@ -534,7 +532,7 @@
     <Properties>
       <Type Name="ProviderType" Type="{typeof(button:CommandButtonProvider)}"/>
 
-      <TransformByAttributeAnimation Name="ItemAnimation" Attribute="Index" Delay="0.125" Source="{anim:Animations.PivotShowAnim}"/>
+      <TransformByAttributeAnimation Name="ItemAnimation" Attribute="Index" Delay="0.125" Source="{ianim:Animations.PivotShowAnim}"/>
       
       <Type Name="ScrollControlType" Type="{typeof(me:ScrollArrows)}"/>
       <AnchorLayoutInput Name="ScrollControlHorizontal"
@@ -562,10 +560,10 @@
       <Script> 
         
         
-        Scroller.Prefetch = 2.0; 
+        Scroller.Prefetch = 2;
       </Script>
       
-      <Script> 
+      <!--<Script> 
         [DeclareTrigger(ScrollData.CanScrollUp)]
         [DeclareTrigger(ScrollData.CanScrollDown)]
         
@@ -589,7 +587,7 @@
         [DeclareTrigger(SetFadeTimer.Tick)]
         Scroller.ShowNear = ScrollData.CanScrollUp; 
         Scroller.ShowFar = ScrollData.CanScrollDown; 
-      </Script>
+      </Script>-->
     </Scripts>
   </UI>
   
@@ -604,7 +602,7 @@
       <iris:Command Name="ScrollRightCommand"/>
     </Locals>
     
-    <Scripts>
+    <!--<Scripts>
       <Script>
         ScrollLeftCommand.Available = ScrollData.CanScrollUp;
         ScrollRightCommand.Available = ScrollData.CanScrollDown;
@@ -634,7 +632,7 @@
         [DeclareTrigger(ScrollRightCommand.Invoked)]
         ScrollData.ScrollDown();
       </Script>
-    </Scripts>
+    </Scripts>-->
     
     <Content>
       <Panel Layout="HorizontalFlow">
@@ -680,11 +678,11 @@
 
 
 
-  <UI Name="BottomPivotLabelListItem" Base="listcore:LabelListItemBase">
+  <!--<UI Name="BottomPivotLabelListItem" Base="listcore:LabelListItemBase">
     <Scripts>
       <Script>UI.FocusInterestTargetMargins = me:Constants.OverlapMargins;</Script>
     </Scripts>
-  </UI>
+  </UI>-->