ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Textbox border change. GUI changes accordingly. Checkbox in login dialog isn't properly aligned though.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13479 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
unitraxx 2013-08-15 01:24:49 +00:00
commit c15f5537d4
6 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
data/gui/online/login_dialog.stkgui
View File

@ -1,11 +1,11 @@
<stkgui> <stkgui>
<div x="2%" y="5%" width="96%" height="85%" layout="vertical-row" > <div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" >
<header id="title" width="96%" height="fit" text_align="center" word_wrap="true" <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
I18N="In the login dialog' dialog" text="Sign in"/> I18N="In the login dialog' dialog" text="Sign in"/>
<spacer height="20" width="50"> <spacer height="25" width="50">
<label id="message" proportion="2" width="90%" align="center" text_align="left" word_wrap="true" text=""/> <label id="message" proportion="2" width="90%" align="center" text_align="left" word_wrap="true" text=""/>
@ -13,21 +13,15 @@
<div width="80%" align="center" layout="vertical-row" height="fit" > <div width="80%" align="center" layout="vertical-row" height="fit" >
<div width="100%" height="fit" layout="horizontal-row" > <div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the login dialog" text="Username"/> <label proportion="1" height="100%" text_align="left" I18N="In the login dialog" text="Username"/>
<div proportion="2" height="100%" layout="horizontal-row"> <textbox proportion="2" height="fit" id="username" I18N="In the login dialog"/>
<spacer height="1" width="2%">
<textbox proportion="2" id="username" I18N="In the login dialog"/>
</div>
</div> </div>
<spacer height="20" width="20"> <spacer height="20" width="20">
<div width="100%" height="fit" layout="horizontal-row" > <div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the login dialog" text="Password"/> <label proportion="1" height="100%" text_align="left" I18N="In the login dialog" text="Password"/>
<div proportion="2" height="100%" layout="horizontal-row"> <textbox x="5" proportion="2" height="fit" id="password" I18N="In the login dialog"/>
<spacer height="1" width="2%">
<textbox proportion="2" id="password" I18N="In the login dialog"/>
</div>
</div> </div>
<spacer height="20" width="20"> <spacer height="20" width="20">
@ -46,7 +40,7 @@
<spacer height="20" width="50"> <spacer height="20" width="50">
<buttonbar id="options" width="90%" proportion="1" align="center"> <buttonbar id="options" width="90%" height="13%" align="center">
<icon-button id="sign_in" width="64" height="64" icon="gui/green_check.png" <icon-button id="sign_in" width="64" height="64" icon="gui/green_check.png"
I18N="Login dialog" text="Sign In" label_location="bottom"/> I18N="Login dialog" text="Sign In" label_location="bottom"/>
<icon-button id="recovery" width="64" height="64" icon="gui/main_help.png" <icon-button id="recovery" width="64" height="64" icon="gui/main_help.png"

3
data/gui/online/profile_friends.stkgui
View File

@ -22,9 +22,8 @@
<spacer width="10" height="10"/> <spacer width="10" height="10"/>
<div height="fit" width="100%" layout="horizontal-row" align="center"> <div height="fit" width="100%" layout="horizontal-row" align="center">
<textbox id="search_box" proportion="1" height="100%"/> <textbox id="search_box" proportion="1" height="100%"/>
<spacer width="30" height="10"/>
<button id="search_button" height="fit" width="fit" text="Search" />
<spacer width="10" height="10"/> <spacer width="10" height="10"/>
<button id="search_button" height="fit" width="fit" text="Search" />
</div> </div>
</div> </div>
<spacer width="2%" height="10"/> <spacer width="2%" height="10"/>

6
data/gui/online/registration_info.stkgui
View File

@ -1,18 +1,18 @@
<stkgui> <stkgui>
<div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" > <div x="2%" y="4%" width="96%" height="92%" layout="vertical-row" >
<header id="title" width="96%" height="fit" text_align="center" word_wrap="true" <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
I18N="In the registration dialog' dialog" text="Registration Complete"/> I18N="In the registration dialog' dialog" text="Registration Complete"/>
<spacer height="20" width="50"> <spacer height="25" width="50">
<label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" I18N="In the registration dialog" <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" I18N="In the registration dialog"
text="You will receive an email with further instructions regarding account activation. Please be patient and be sure to check your spam folder."/> text="You will receive an email with further instructions regarding account activation. Please be patient and be sure to check your spam folder."/>
<spacer height="20" width="50"> <spacer height="20" width="50">
<buttonbar id="options" width="25%" height="15%" align="center"> <buttonbar id="options" width="25%" height="14%" align="center">
<icon-button id="cancel" width="64" height="64" icon="gui/green_check.png" <icon-button id="cancel" width="64" height="64" icon="gui/green_check.png"
I18N="Registration dialog" text="Close" label_location="none"/> I18N="Registration dialog" text="Close" label_location="none"/>
</buttonbar> </buttonbar>

28
data/gui/online/registration_input.stkgui
View File

@ -1,44 +1,44 @@
<stkgui> <stkgui>
<div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" > <div x="2%" y="4%" width="96%" height="92%" layout="vertical-row" >
<header id="title" width="96%" proportion="1" text_align="center" word_wrap="true" <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
I18N="In the registration dialog' dialog" text="Registration"/> I18N="In the registration dialog' dialog" text="Registration"/>
<spacer height="40" width="50"> <spacer height="25" width="50">
<div width="80%" align="center" layout="vertical-row" height="fit"> <div width="80%" align="center" layout="vertical-row" height="fit">
<div width="100%" height="fit" layout="horizontal-row" > <div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the registration dialog" text="Username"/> <label proportion="1" height="100%" text_align="left" I18N="In the registration dialog" text="Username"/>
<textbox proportion="2" id="username" I18N="In the registration dialog"/> <textbox proportion="2" height="fit" id="username" I18N="In the registration dialog"/>
</div> </div>
<spacer height="20" width="20"> <spacer height="20" width="20">
<div width="100%" height="fit" layout="horizontal-row" > <div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the registration dialog" text="Password"/> <label proportion="1" height="100%" text_align="left" I18N="In the registration dialog" text="Password"/>
<textbox proportion="2" id="password" I18N="In the registration dialog"/> <textbox proportion="2" height="fit" id="password" I18N="In the registration dialog"/>
</div> </div>
<spacer height="20" width="20"> <spacer height="20" width="20">
<div width="100%" height="fit" layout="horizontal-row" > <div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the registration dialog" text="Confirm"/> <label proportion="1" height="100%" text_align="left" I18N="In the registration dialog" text="Confirm"/>
<textbox proportion="2" id="password_confirm" I18N="In the registration dialog"/> <textbox proportion="2" height="fit" id="password_confirm" I18N="In the registration dialog"/>
</div> </div>
<spacer height="20" width="20"> <spacer height="20" width="20">
<div width="100%" height="fit" layout="horizontal-row" > <div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the registration dialog" text="Email"/> <label proportion="1" height="100%" text_align="left" I18N="In the registration dialog" text="Email"/>
<textbox proportion="2" id="email" I18N="In the registration dialog"/> <textbox proportion="2" height="fit" id="email" I18N="In the registration dialog"/>
</div> </div>
<spacer height="20" width="20"> <spacer height="20" width="20">
<div width="100%" height="fit" layout="horizontal-row" > <div width="100%" height="fit" layout="horizontal-row" >
<label proportion="1" text_align="left" I18N="In the registration dialog" text="Confirm"/> <label proportion="1" height="100%" text_align="left" I18N="In the registration dialog" text="Confirm"/>
<textbox proportion="2" id="email_confirm" I18N="In the registration dialog"/> <textbox proportion="2" height="fit" id="email_confirm" I18N="In the registration dialog"/>
</div> </div>
</div> </div>
@ -49,7 +49,7 @@
<spacer height="20" width="50"> <spacer height="20" width="50">
<buttonbar id="options" width="25%" proportion="1" align="center"> <buttonbar id="options" width="25%" height="14%" align="center">
<icon-button id="next" width="64" height="64" icon="gui/green_check.png" <icon-button id="next" width="64" height="64" icon="gui/green_check.png"
I18N="Registration dialog" text="Next" label_location="none"/> I18N="Registration dialog" text="Next" label_location="none"/>
<icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png" <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"

8
data/gui/online/registration_terms.stkgui
View File

@ -1,11 +1,11 @@
<stkgui> <stkgui>
<div x="2%" y="5%" width="96%" height="90%" layout="vertical-row" > <div x="2%" y="4%" width="96%" height="92%" layout="vertical-row" >
<header id="title" width="96%" proportion="1" text_align="center" word_wrap="true" <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
I18N="In the registration dialog' dialog" text="Terms and Agreement"/> I18N="In the registration dialog' dialog" text="Terms and Agreement"/>
<spacer height="20" width="50"> <spacer height="25" width="50">
<box proportion="5" width="90%" align="center" layout="vertical-row" padding="8"> <box proportion="5" width="90%" align="center" layout="vertical-row" padding="8">
<list id="terms" x="0" y="0" width="100%" height="100%"/> <list id="terms" x="0" y="0" width="100%" height="100%"/>
@ -24,7 +24,7 @@
<spacer height="20" width="50"> <spacer height="20" width="50">
<buttonbar id="options" width="45%" proportion="1" align="center"> <buttonbar id="options" width="45%" height="14%" align="center">
<icon-button id="previous" width="64" height="64" icon="gui/back.png" <icon-button id="previous" width="64" height="64" icon="gui/back.png"
I18N="Registration dialog" text="Previous" label_location="bottom"/> I18N="Registration dialog" text="Previous" label_location="bottom"/>
<icon-button id="next" width="64" height="64" icon="gui/green_check.png" <icon-button id="next" width="64" height="64" icon="gui/green_check.png"

8
src/guiengine/skin.cpp
View File

@ -2030,8 +2030,8 @@ void Skin::draw3DSunkenPane (IGUIElement *element, video::SColor bgcolor,
SColor& border_color_focus = SkinConfig::m_colors["text_field::focused"]; SColor& border_color_focus = SkinConfig::m_colors["text_field::focused"];
core::recti borderArea = rect; core::recti borderArea = rect;
borderArea.UpperLeftCorner -= position2d< s32 >( 2, 2 ); //borderArea.UpperLeftCorner -= position2d< s32 >( 2, 2 );
borderArea.LowerRightCorner += position2d< s32 >( 2, 2 ); //borderArea.LowerRightCorner += position2d< s32 >( 2, 2 );
// if within an appearing dialog, grow // if within an appearing dialog, grow
if (m_dialog && m_dialog_size < 1.0f && widget->m_parent != NULL && if (m_dialog && m_dialog_size < 1.0f && widget->m_parent != NULL &&
@ -2056,8 +2056,8 @@ void Skin::draw3DSunkenPane (IGUIElement *element, video::SColor bgcolor,
GUIEngine::getDriver()->draw2DRectangle(focused ? border_color_focus : border_color, borderArea); GUIEngine::getDriver()->draw2DRectangle(focused ? border_color_focus : border_color, borderArea);
core::recti innerArea = borderArea; core::recti innerArea = borderArea;
innerArea.UpperLeftCorner += position2d< s32 >( 2, 2 ); innerArea.UpperLeftCorner += position2d< s32 >( 3, 3 );
innerArea.LowerRightCorner -= position2d< s32 >( 2, 2 ); innerArea.LowerRightCorner -= position2d< s32 >( 3, 3 );
GUIEngine::getDriver()->draw2DRectangle(focused ? bg_color_focused : bg_color, innerArea); GUIEngine::getDriver()->draw2DRectangle(focused ? bg_color_focused : bg_color, innerArea);
return; return;
} }