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

Added support for multi-line ribbon labels (it doesn't look sexy atm, but fixes unreadable text issues)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4367 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2009-12-30 18:08:23 +00:00
parent 62ee51e383
commit 9faed0a64b
1 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/guiengine/widgets/ribbon_widget.cpp
View File

@@ -22,6 +22,8 @@
#include "io/file_manager.hpp"
#include "utils/string_utils.hpp"
#include <cmath>
using namespace GUIEngine;
using namespace irr::core;
using namespace irr::gui;
@@ -159,7 +161,15 @@ void RibbonWidget::add()
{
// how much space to keep for the label under the button
const bool has_label = m_children[i].m_text.size() > 0;
const int needed_space_under_button = has_label ? GUIEngine::getFontHeight() : 10;
int line_number = 1;
core::dimension2d< u32 > dim = GUIEngine::getFont()->getDimension( m_children[i].m_text.c_str() );
if ((int)dim.Width > one_button_space)
{
line_number = std::ceil((float)dim.Width/(float)one_button_space);
}
const int needed_space_under_button = has_label ? GUIEngine::getFontHeight()*line_number : 10;
float imageRatio = (float)m_children[i].w/(float)m_children[i].h;
@@ -204,28 +214,8 @@ void RibbonWidget::add()
m_children[i].w = old_w;
m_children[i].h = old_h;
// ---- label part
/*
if (has_label)
{
subsize = rect<s32>(widget_x - one_button_space/2,
(int)((button_y + m_children[i].h)*zoom) + 5, // leave 5 pixels between button and label
widget_x + (int)(one_button_space/2.0f), h);
stringw& message = m_children[i].m_text;
IGUIStaticText* label = GUIEngine::getGUIEnv()->addStaticText(message.c_str(), subsize, false, true, btn);
label->setTextAlignment(EGUIA_CENTER, EGUIA_CENTER);
label->setTabStop(false);
label->setNotClipped(true);
m_labels.push_back(label);
const int final_y = subsize.getHeight() + label->getTextHeight();
if(final_y > biggest_y) biggest_y = final_y;
}
*/
//subbtn->setTabStop(false);
//subbtn->setTabGroup(false);
// the label itself will be added by the icon widget. since it adds the label outside of the
// widget area it is assigned to, the label will appear in the area we want at the bottom
}
else
{