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

started adding resolution choice... a bit different from proposed design, but simpler this way. work in progress, does nothing yet, presentation can be improved

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3405 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2009-04-19 01:49:08 +00:00
parent 3e285d2e56
commit 546816d2d4
8 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
data/gui/options_av.stkgui
View File

@ -45,9 +45,24 @@
<spacer proportion="1" width="10" proportion="1"/>
<!-- TODO - add resolution choice -->
<label align="center" text="TODO"/>
<!--
<ribbon_grid id="resolutions" proportion="4" width="100%" square_items="false" align="center" child_width="128" child_height="128" />
-->
<spacer proportion="2" width="10" proportion="1"/>
<ribbon id="resolutions" height="20%" width="100%" align="center">
<icon-button id="1280x1024" text="1280x1024" icon="gui/screen54.png"width="128" height="128" />
<icon-button id="800x600" text="800x600" icon="gui/screen43.png"width="128" height="128" />
<icon-button id="1024x768" text="1024x768" icon="gui/screen43.png"width="128" height="128" />
<icon-button id="1152x864" text="1152x864" icon="gui/screen43.png"width="128" height="128" />
<icon-button id="1280x960" text="1280x960" icon="gui/screen43.png"width="128" height="128" />
<icon-button id="1400x1050" text="1400x1050" icon="gui/screen43.png"width="128" height="128" />
<icon-button id="1280x800" text="1280x800" icon="gui/screen1610.png"width="128" height="128" />
<icon-button id="1440x900" text="1440x900" icon="gui/screen1610.png"width="128" height="128" />
<icon-button id="1680x1050" text="1680x1050" icon="gui/screen1610.png"width="128" height="128" />
<icon-button id="1920x1200" text="1920x1200" icon="gui/screen1610.png"width="128" height="128" />
<icon-button id="1280x768" text="1280x768" icon="gui/screen53.png"width="128" height="128" />
</ribbon>
</div>

BIN
data/gui/screen1610.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
data/gui/screen43.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
data/gui/screen53.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
data/gui/screen54.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

2
src/gui/skin.cpp
View File

@ -592,7 +592,7 @@ void Skin::process3DPane(IGUIElement *element, const core::rect< s32 > &rect, co
else if(type == WTYPE_CHECKBOX)
{
drawCheckBox(rect, widget, focused);
}
}
}
void Skin::draw3DButtonPanePressed (IGUIElement *element, const core::rect< s32 > &rect, const core::rect< s32 > *clip)

25
src/gui/state_manager.cpp
View File

@ -303,6 +303,31 @@ namespace StateManager
sfx->setState( user_config->doSFX() );
music->setState( user_config->doMusic() );
/*
{
GUIEngine::RibbonGridWidget* res = dynamic_cast<GUIEngine::RibbonGridWidget*>
(GUIEngine::getCurrentScreen()->getWidget("resolutions"));
assert( res != NULL );
static bool resolutions_inited = false;
if(!resolutions_inited)
{
res->addItem("1280x1024","1280x1024","gui/screen54.png");
res->addItem("800x600","800x600","gui/screen43.png");
res->addItem("1024x768","1024x768","gui/screen43.png");
res->addItem("1152x864","1152x864","gui/screen43.png");
res->addItem("1280x960","1280x960","gui/screen43.png");
res->addItem("1400x1050","1400x1050","gui/screen43.png");
res->addItem("1280x800","1280x800","gui/screen1610.png");
res->addItem("1440x900","1440x900","gui/screen1610.png");
res->addItem("1680x1050","1680x1050","gui/screen1610.png");
res->addItem("1920x1200","1920x1200","gui/screen1610.png");
res->addItem("1280x768","1280x768","gui/screen53.png");
resolutions_inited = true;
}
res->updateItemDisplay();
}*/
}
}
// -- options

1
src/gui/widget.cpp
View File

@ -808,7 +808,6 @@ void RibbonGridWidget::add()
// add rows
for(int n=0; n<row_amount; n++)
{
// FIXME - only add the first time, not everytime
RibbonWidget* ribbon = new RibbonWidget(RIBBON_TOOLBAR);
ribbon->x = x;
ribbon->y = y + (int)(n*row_height);