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

fixed bug in scrolling icon grids - if more items than available space existed, scrolling would be useless

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3407 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2009-04-20 16:03:55 +00:00
parent ccefa05789
commit a1826c8c0d
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
data/gui/options_av.stkgui
View File

@ -47,21 +47,6 @@
<ribbon_grid id="resolutions" proportion="4" text="all" width="100%" square_items="false" align="center" child_width="128" child_height="128" />
<!--
<ribbon id="resolutions" proportion="2" 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>
-->
<button id="apply_resolution" width="20%" height="30" text="Apply changes" />
</div>

26
src/gui/widget.cpp
View File

@ -963,12 +963,15 @@ bool RibbonGridWidget::transmitEvent(Widget* w, std::string& originator)
void RibbonGridWidget::scroll(const int x_delta)
{
m_scroll_offset += x_delta;
const int max_scroll = std::max(m_col_amount, m_needed_cols) - 1;
if(m_scroll_offset < 0) m_scroll_offset = max_scroll;
else if(m_scroll_offset > max_scroll) m_scroll_offset = 0;
std::cout << "m_needed_cols=" << m_needed_cols << " max_scroll=" << max_scroll << " m_scroll_offset=" << m_scroll_offset << std::endl;
updateItemDisplay();
}
// -----------------------------------------------------------------------------
@ -1043,13 +1046,15 @@ void RibbonGridWidget::addItem( std::string user_name, std::string code_name, st
// -----------------------------------------------------------------------------
void RibbonGridWidget::updateItemDisplay()
{
int trackid = 0;
int icon_id = 0;
const int row_amount = m_rows.size();
const int track_amount = m_items.size();
const int item_amount = m_items.size();
m_needed_cols = (int)ceil( (float)track_amount / (float)row_amount );
m_needed_cols = (int)ceil( (float)item_amount / (float)row_amount );
const int max_scroll = std::max(m_col_amount, m_needed_cols) - 1;
for(int n=0; n<row_amount; n++)
{
RibbonWidget& row = m_rows[n];
@ -1061,15 +1066,18 @@ void RibbonGridWidget::updateItemDisplay()
IGUIButton* button = dynamic_cast<IGUIButton*>(icon->m_element);
assert(button != NULL);
trackid = ((i+m_scroll_offset)%m_col_amount)*row_amount + n%row_amount;
int col_scroll = i + m_scroll_offset;
while(col_scroll > max_scroll) col_scroll -= max_scroll+1;
if( trackid < track_amount )
icon_id = (col_scroll)*row_amount + n;
if( icon_id < item_amount )
{
std::string track_sshot = file_manager->getDataDir() + "/" + m_items[trackid].m_sshot_file;
std::string track_sshot = file_manager->getDataDir() + "/" + m_items[icon_id].m_sshot_file;
button->setImage( GUIEngine::getDriver()->getTexture( track_sshot.c_str() ));
button->setPressedImage( GUIEngine::getDriver()->getTexture( track_sshot.c_str()) );
icon->m_properties[PROP_ID] = m_items[trackid].m_code_name;
row.setLabel(i, m_items[trackid].m_user_name);
icon->m_properties[PROP_ID] = m_items[icon_id].m_code_name;
row.setLabel(i, m_items[icon_id].m_user_name);
}
else
{