mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-11-04 06:26:39 +00:00 
			
		
		
		
	Merge branch 'spell____prices' into 'master'
Spell buying window layout tweaks See merge request OpenMW/openmw!4571
This commit is contained in:
		
						commit
						0d308eae3e
					
				
					 2 changed files with 11 additions and 11 deletions
				
			
		| 
						 | 
					@ -62,7 +62,7 @@ namespace MWGui
 | 
				
			||||||
        mCurrentY += lineHeight;
 | 
					        mCurrentY += lineHeight;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        toAdd->setUserData(price);
 | 
					        toAdd->setUserData(price);
 | 
				
			||||||
        toAdd->setCaptionWithReplacing(spell.mName + "   -   " + MyGUI::utility::toString(price) + "#{sgp}");
 | 
					        toAdd->setCaptionWithReplacing(spell.mName + "  - " + MyGUI::utility::toString(price) + "#{sgp}");
 | 
				
			||||||
        toAdd->setSize(mSpellsView->getWidth(), lineHeight);
 | 
					        toAdd->setSize(mSpellsView->getWidth(), lineHeight);
 | 
				
			||||||
        toAdd->eventMouseWheel += MyGUI::newDelegate(this, &SpellBuyingWindow::onMouseWheel);
 | 
					        toAdd->eventMouseWheel += MyGUI::newDelegate(this, &SpellBuyingWindow::onMouseWheel);
 | 
				
			||||||
        toAdd->setUserString("ToolTipType", "Spell");
 | 
					        toAdd->setUserString("ToolTipType", "Spell");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,28 +1,28 @@
 | 
				
			||||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
<MyGUI type="Layout">
 | 
					<MyGUI type="Layout">
 | 
				
			||||||
    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 288" align="Center" name="_Main">
 | 
					    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 290" align="Center" name="_Main">
 | 
				
			||||||
        <Property key="Visible" value="false"/>
 | 
					        <Property key="Visible" value="false"/>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <Widget type="TextBox" skin="SandText" position="8 24 450 18" align="Right Top">
 | 
					        <Widget type="TextBox" skin="NormalText" position="0 6 442 18" align="Center Top">
 | 
				
			||||||
            <Property key="TextAlign" value="Left"/>
 | 
					 | 
				
			||||||
            <Property key="Caption" value="#{sSpellServiceTitle}"/>
 | 
					 | 
				
			||||||
        </Widget>
 | 
					 | 
				
			||||||
        <Widget type="TextBox" skin="NormalText" position="0 4 434 18" align="Center Top">
 | 
					 | 
				
			||||||
            <Property key="TextAlign" value="Center"/>
 | 
					            <Property key="TextAlign" value="Center"/>
 | 
				
			||||||
            <Property key="Caption" value="#{sServiceSpellsTitle}"/>
 | 
					            <Property key="Caption" value="#{sServiceSpellsTitle}"/>
 | 
				
			||||||
        </Widget>
 | 
					        </Widget>
 | 
				
			||||||
 | 
					        <Widget type="TextBox" skin="SandText" position="6 25 450 18" align="Right Top">
 | 
				
			||||||
 | 
					            <Property key="TextAlign" value="Left"/>
 | 
				
			||||||
 | 
					            <Property key="Caption" value="#{sSpellServiceTitle}"/>
 | 
				
			||||||
 | 
					        </Widget>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <Widget type="Widget" skin="MW_Box" position="6 41 429 204" align="Left Stretch">
 | 
					        <Widget type="Widget" skin="MW_Box" position="6 42 430 205" align="Left Stretch">
 | 
				
			||||||
            <Widget type="ScrollView" skin="MW_ScrollView" position="2 2 427 198" align="Left Top Stretch" name="SpellsView">
 | 
					            <Widget type="ScrollView" skin="MW_ScrollView" position="4 3 425 197" align="Left Top Stretch" name="SpellsView">
 | 
				
			||||||
                <Property key="CanvasAlign" value="Left"/>
 | 
					                <Property key="CanvasAlign" value="Left"/>
 | 
				
			||||||
            </Widget>
 | 
					            </Widget>
 | 
				
			||||||
        </Widget>
 | 
					        </Widget>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <Widget type="TextBox" skin="SandText" position="8 250 24 24" name="PlayerGold" align="Right Top">
 | 
					        <Widget type="TextBox" skin="SandText" position="6 253 24 24" name="PlayerGold" align="Right Top">
 | 
				
			||||||
            <Property key="TextAlign" value="Right"/>
 | 
					            <Property key="TextAlign" value="Right"/>
 | 
				
			||||||
        </Widget>
 | 
					        </Widget>
 | 
				
			||||||
        <Widget type="AutoSizedButton" skin="MW_Button" position="375 251 60 24" name="CancelButton" align="Right Top">
 | 
					        <Widget type="AutoSizedButton" skin="MW_Button" position="376 253 60 24" name="CancelButton" align="Right Top">
 | 
				
			||||||
            <Property key="ExpandDirection" value="Left"/>
 | 
					            <Property key="ExpandDirection" value="Left"/>
 | 
				
			||||||
            <Property key="Caption" value="#{Interface:OK}"/>
 | 
					            <Property key="Caption" value="#{Interface:OK}"/>
 | 
				
			||||||
        </Widget>
 | 
					        </Widget>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue