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

Merge branch 'tooltip'

Browse Source
This commit is contained in:
Marianne Gagnon 2015-03-10 19:48:21 -04:00
commit 9d5c735ccb
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/guiengine/skin.cpp
View File

@ -1608,6 +1608,12 @@ void Skin::drawCheckBox(const core::recti &rect, Widget* widget, bool focused)
0 /* no clipping */, 0, 0 /* no clipping */, 0,
true /* alpha */); true /* alpha */);
} }
if (focused && widget->hasTooltip())
{
m_tooltip_at_mouse.push_back(true);
m_tooltips.push_back(widget);
}
} // drawCheckBox } // drawCheckBox
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -1842,7 +1848,7 @@ void Skin::drawTooltip(Widget* widget, bool atMouse)
if (atMouse) if (atMouse)
{ {
pos = irr_driver->getDevice()->getCursorControl()->getPosition() pos = irr_driver->getDevice()->getCursorControl()->getPosition()
+ core::position2di(15, 15); + core::position2di(10 - size.Width / 2, 20);
} }
core::recti r(pos, size); core::recti r(pos, size);

1
src/states_screens/options_screen_ui.cpp
View File

@ -151,6 +151,7 @@ void OptionsScreenUI::init()
CheckBoxWidget* difficulty = getWidget<CheckBoxWidget>("perPlayerDifficulty"); CheckBoxWidget* difficulty = getWidget<CheckBoxWidget>("perPlayerDifficulty");
assert( difficulty != NULL ); assert( difficulty != NULL );
difficulty->setState( UserConfigParams::m_per_player_difficulty ); difficulty->setState( UserConfigParams::m_per_player_difficulty );
difficulty->setTooltip(_("Players can select handicapped (more difficult) profiles on the kart selection screen"));
CheckBoxWidget* show_login = getWidget<CheckBoxWidget>("show-login"); CheckBoxWidget* show_login = getWidget<CheckBoxWidget>("show-login");
assert( show_login!= NULL ); assert( show_login!= NULL );