Merge pull request #1244 from akortunov/develop

MyGUI vertical alignment
pull/190/head
scrawl 8 years ago committed by GitHub
commit 9e7ade4ba4

@ -167,7 +167,7 @@ namespace MWGui
Gui::MWList* mTopicsList;
MyGUI::ScrollBar* mScrollBar;
MyGUI::ProgressBar* mDispositionBar;
MyGUI::EditBox* mDispositionText;
MyGUI::TextBox* mDispositionText;
PersuasionDialog mPersuasionDialog;
};

@ -81,7 +81,7 @@
<Child type="Widget" skin="BTN_BottomLeft" offset="0 20 4 4" align="Bottom Left"/>
<Child type="Widget" skin="BTN_BottomRight" offset="132 20 4 4" align="Bottom Right"/>
<BasisSkin type="SimpleText" offset="4 4 128 16" align="Stretch">
<BasisSkin type="SimpleText" offset="4 3 128 16" align="Stretch">
<State name="disabled" colour="#{fontcolour=disabled}" shift="0"/>
<State name="normal" colour="#{fontcolour=normal}" shift="0"/>
<State name="highlighted" colour="#{fontcolour=normal_over}" shift="0"/>

@ -16,9 +16,11 @@
</Widget>
<!-- The disposition bar-->
<Widget type="ProgressBar" skin="MW_EnergyBar_Blue" position="398 8 166 18"
<Widget type="ProgressBar" skin="MW_Progress_Blue" position="398 8 166 18"
align="Right Top" name="Disposition">
<Widget type="EditBox" skin="MW_DispositionEdit" position_real="0 0 1 1" align="Stretch" name="DispositionText"/>
<Widget type="TextBox" skin="ProgressText" position="0 0 166 14" name="DispositionText" align="Right VCenter">
<Property key="NeedMouse" value="false"/>
</Widget>
</Widget>
<!-- The list of topics -->
<Widget type="MWList" skin="MW_SimpleList" position="398 31 166 328" name="TopicsList" align="Right VStretch">

@ -1,14 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Resource" version="1.1">
<Resource type="ResourceSkin" name="MW_DispositionEdit" size="0 0 50 50">
<Property key="FontName" value="Default"/>
<Property key="TextAlign" value="Center"/>
<Property key="Static" value="1"/>
<Property key="WordWrap" value="true"/>
<Property key="TextShadow" value="true"/>
<Child type="TextBox" skin="SandText" offset="0 0 0 -4" align="Stretch" name="Client"/>
</Resource>
</MyGUI>

@ -23,7 +23,7 @@
<Property key="TextAlign" value="Left VCenter"/>
<Property key="TextColour" value="#{fontcolour=normal}"/>
<Child type="TextBox" skin="MW_TextEditClient" offset="4 1 502 18" align="Stretch" name="Client"/>
<Child type="TextBox" skin="MW_TextEditClient" offset="4 0 502 18" align="Stretch" name="Client"/>
</Resource>

@ -6,7 +6,7 @@
<Widget type="Widget" skin="MW_Dialog" position="0 245 300 48" align="Bottom HCenter" name="LoadingBox">
<Widget type="TextBox" skin="SandText" position="20 8 260 18" align="Stretch" name="LoadingText">
<Widget type="TextBox" skin="SandText" position="20 9 260 18" align="Stretch" name="LoadingText">
<Property key="TextAlign" value="Center"/>
</Widget>

@ -59,7 +59,7 @@
</Resource>
<Resource type="ResourceSkin" name="ProgressText" size="16 16">
<Property key="FontName" value="Default"/>
<Property key="TextAlign" value="Top HCenter"/>
<Property key="TextAlign" value="VCenter HCenter"/>
<Property key="TextColour" value="#{fontcolour=normal}"/>
<Property key="TextShadow" value="true"/>

@ -101,7 +101,7 @@
<Property key="ModeDrop" value="true"/>
<Widget type="Widget" skin="MW_Box" position="0 0 100 26" align="Stretch">
<Widget type="TextBox" skin="SandText" position="6 2 71 20" align="Stretch" name="Client">
<Widget type="TextBox" skin="SandText" position="6 3 71 20" align="Stretch" name="Client">
<Property key="TextAlign" value="Left VCenter"/>
</Widget>
<Widget type="ListBox" skin="MW_PopupList" position="65 38 100 200" style="Popup" layer="Popup" name="List">

@ -45,6 +45,7 @@
<Widget type="AutoSizedEditBox" skin="SandText" position="0 0 263 0" name="InfoText">
<Property key="Static" value="true"/>
<Property key="MultiLine" value="true"/>
<Property key="WordWrap" value="true"/>
</Widget>

@ -20,9 +20,9 @@
</Widget>
<Widget type="ProgressBar" skin="MW_Progress_Red" position="74 0 130 18" name="HBar" align="Right Top">
<Property key="NeedMouse" value="false"/>
</Widget>
<Widget type="TextBox" skin="ProgressText" position="74 0 130 18" name="HBarT" align="Right Top">
<Property key="NeedMouse" value="false"/>
<Widget type="TextBox" skin="ProgressText" position="0 0 130 14" name="HBarT" align="Right VCenter">
<Property key="NeedMouse" value="false"/>
</Widget>
</Widget>
</Widget>
@ -40,10 +40,9 @@
<Widget type="ProgressBar" skin="MW_Progress_Blue" position="74 0 130 18" name="MBar" align="Right Top">
<Property key="NeedMouse" value="false"/>
</Widget>
<Widget type="TextBox" skin="ProgressText" position="74 0 130 18" name="MBarT" align="Right Top">
<Property key="NeedMouse" value="false"/>
<Widget type="TextBox" skin="ProgressText" position="0 0 130 14" name="MBarT" align="Right VCenter">
<Property key="NeedMouse" value="false"/>
</Widget>
</Widget>
</Widget>
@ -61,9 +60,9 @@
<Widget type="ProgressBar" skin="MW_Progress_Green" position="74 0 130 18" name="FBar" align="Right Top">
<Property key="NeedMouse" value="false"/>
</Widget>
<Widget type="TextBox" skin="ProgressText" position="74 0 130 18" name="FBarT" align="Right Top">
<Property key="NeedMouse" value="false"/>
<Widget type="TextBox" skin="ProgressText" position="0 0 130 14" name="FBarT" align="Right VCenter">
<Property key="NeedMouse" value="false"/>
</Widget>
</Widget>
</Widget>
</Widget>

@ -21,7 +21,7 @@ color_misc=0,205,205 # ????
<Resource type="ResourceSkin" name="SandText" size="16 16">
<Property key="FontName" value="Default"/>
<Property key="TextAlign" value="Left Bottom"/>
<BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch">
<BasisSkin type="SimpleText" offset="0 -1 16 16" align="Stretch">
<State name="normal" colour="#{fontcolour=normal}" shift="0"/>
</BasisSkin>
</Resource>
@ -134,12 +134,12 @@ color_misc=0,205,205 # ????
<Resource type="ResourceSkin" name="MW_ChargeBar" size="204 18">
<Child type="ProgressBar" skin="MW_Progress_Red" offset="0 0 204 18" align="Right Top Stretch" name="Bar"/>
<Child type="TextBox" skin="ProgressText" offset="0 0 204 18" align="Right Top Stretch" name="BarText"/>
<Child type="TextBox" skin="ProgressText" offset="0 0 204 14" align="Stretch" name="BarText"/>
</Resource>
<Resource type="ResourceSkin" name="MW_ChargeBar_Blue" size="204 18">
<Child type="ProgressBar" skin="MW_Progress_Blue" offset="0 0 204 18" align="Right Top Stretch" name="Bar"/>
<Child type="TextBox" skin="ProgressText" offset="0 2 204 18" align="Right Top Stretch" name="BarText"/>
<Child type="TextBox" skin="ProgressText" offset="0 1 204 14" align="Right Top Stretch" name="BarText"/>
</Resource>
<Resource type="ResourceSkin" name="MW_DynamicStat_Red" size="204 18">

@ -165,7 +165,7 @@
</Widget>
<Widget type="ProgressBar" skin="MW_Progress_Red" position="50 70 200 20" align="HCenter Bottom" name="SkillProgress">
<Widget type="TextBox" skin="ProgressText" position="0 0 200 20" align="Stretch" name="SkillProgressText">
<Widget type="TextBox" skin="ProgressText" position="0 0 200 16" align="Stretch" name="SkillProgressText">
<Property key="TextAlign" value="Center"/>
</Widget>
</Widget>
@ -211,7 +211,7 @@
</Widget>
<Widget type="ProgressBar" skin="MW_Progress_Red" position="50 30 200 20" align="HCenter Bottom" name="LevelProgress">
<Widget type="TextBox" skin="ProgressText" position="0 0 200 20" align="Stretch" name="LevelProgressText">
<Widget type="TextBox" skin="ProgressText" position="0 0 200 16" align="Stretch" name="LevelProgressText">
<Property key="TextAlign" value="Center"/>
</Widget>
</Widget>

@ -4,10 +4,9 @@
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 219 40" align="Center" name="_Main">
<Widget type="ProgressBar" skin="MW_Progress_Blue" position="5 6 199 20" name="ProgressBar">
<Widget type="TextBox" skin="SandText" position="0 0 199 20" name="ProgressText">
<Property key="TextAlign" value="Center"/>
<Widget type="TextBox" skin="ProgressText" position="0 0 199 16" name="ProgressText" align="Right VCenter">
<Property key="NeedMouse" value="false"/>
</Widget>
</Widget>
</Widget>
</MyGUI>

Loading…
Cancel
Save