...

vczh-libraries · Jun 6, 2018 · 62583cf · 62583cf
1 parent 9f06e8b
commit 62583cf
Show file tree

Hide file tree

Showing 5 changed files with 925 additions and 448 deletions.
diff --git a/Tutorial/GacUI_Controls/DocumentEditor/UI/DocumentEditorRibbon.xml b/Tutorial/GacUI_Controls/DocumentEditor/UI/DocumentEditorRibbon.xml
@@ -217,9 +217,16 @@
             </att.BeforeHeaders-set>
 
             <att.AfterHeaders-set>
-              <Button Text="  WHATEVER  ">
-                <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0"/>
-              </Button>
+              <Stack Direction="Horizontal" AlignmentToParent="left:0 top:-1 right:0 bottom:0" MinSizeLimitation="LimitToElementAndChildren">
+                <StackItem InternalMargin="left:0 top:0 right:10 bottom:0">
+                  <SolidLabel Font-bind="self.Font" Color="#FFFFFF" Text="Search:" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                </StackItem>
+                <StackItem>
+                  <SinglelineTextBox>
+                    <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:1" PreferredMinSize="x:180"/>
+                  </SinglelineTextBox>
+                </StackItem>
+              </Stack>
             </att.AfterHeaders-set>
 
             <att.Pages>
@@ -301,6 +308,50 @@
                     </att.Items>
                   </RibbonGroup>
 
+                  <RibbonGroup Text="Icon Labels">
+                    <att.Items>
+                      <RibbonButtons MaxSize="Small" MinSize="Icon">
+                        <att.Buttons>
+                          <RibbonIconLabel Text="Left" Image-uri="res://ToolbarImages/TextAlignLeft">
+                            <SinglelineTextBox>
+                              <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="x:36"/>
+                            </SinglelineTextBox>
+                          </RibbonIconLabel>
+                          <RibbonIconLabel Text="Center" Image-uri="res://ToolbarImages/TextAlignCenter">
+                            <SinglelineTextBox>
+                              <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="x:36"/>
+                            </SinglelineTextBox>
+                          </RibbonIconLabel>
+                          <RibbonIconLabel Text="Right" Image-uri="res://ToolbarImages/TextAlignRight">
+                            <SinglelineTextBox>
+                              <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="x:36"/>
+                            </SinglelineTextBox>
+                          </RibbonIconLabel>
+                        </att.Buttons>
+                      </RibbonButtons>
+                      <RibbonSplitter/>
+                      <RibbonButtons MaxSize="Small" MinSize="Icon">
+                        <att.Buttons>
+                          <RibbonIconLabel Text="Left" Image-uri="res://ToolbarImages/TextAlignLeft">
+                            <SinglelineTextBox>
+                              <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="x:36"/>
+                            </SinglelineTextBox>
+                          </RibbonIconLabel>
+                          <RibbonIconLabel Text="Center" Image-uri="res://ToolbarImages/TextAlignCenter">
+                            <SinglelineTextBox>
+                              <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="x:36"/>
+                            </SinglelineTextBox>
+                          </RibbonIconLabel>
+                          <RibbonIconLabel Text="Right" Image-uri="res://ToolbarImages/TextAlignRight">
+                            <SinglelineTextBox>
+                              <att.BoundsComposition-set AlignmentToParent="left:0 top:0 right:0 bottom:0" PreferredMinSize="x:36"/>
+                            </SinglelineTextBox>
+                          </RibbonIconLabel>
+                        </att.Buttons>
+                      </RibbonButtons>
+                    </att.Items>
+                  </RibbonGroup>
+
                   <RibbonGroup Text="Style" LargeImage-uri="res://ToolbarImages/EditableLarge">
                     <att.Items>
                       <BindableRibbonGalleryList ref.Name="styleGallery" ItemTemplate="demo:StyleItemTemplate" MinCount="2" MaxCount="5" VisibleItemCount="5" env.ItemType="demo::StyleGroup^">

diff --git a/Tutorial/GacUI_Controls/DocumentEditor/UI/Resource.xml b/Tutorial/GacUI_Controls/DocumentEditor/UI/Resource.xml
@@ -29,6 +29,7 @@
                 <![CDATA[
                   {
                     var window = new DocumentEditorToolstripWindow*();
+                    window.ForceCalculateSizeImmediately();
                     window.MoveToScreenCenter();
                     window.ShowModalAndDelete(self, func():void{});
                   }
@@ -44,6 +45,7 @@
                 <![CDATA[
                   {
                     var window = new DocumentEditorRibbonWindow*();
+                    window.ForceCalculateSizeImmediately();
                     window.MoveToScreenCenter();
                     window.ShowModalAndDelete(self, func():void{});
                   }