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

made combo ribbons not selected on mouse hover, only on click

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3511 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2009-05-18 00:31:16 +00:00
parent 902fad806e
commit 8295a10974
3 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/gui/skin.cpp
View File

@@ -423,25 +423,49 @@ void Skin::drawRibbonChild(const core::rect< s32 > &rect, const Widget* widget,
widget->m_event_handler->m_event_handler->m_properties[PROP_SQUARE] == "true") use_glow = false;
/* in combo ribbons, always show selection */
if(widget->m_event_handler != NULL && widget->m_event_handler->m_type == WTYPE_RIBBON &&
((RibbonWidget*)widget->m_event_handler)->getRibbonType() == RIBBON_COMBO) always_show_selection = true;
RibbonWidget* w = NULL;
if(widget->m_event_handler != NULL && widget->m_event_handler->m_type == WTYPE_RIBBON)
{
w = dynamic_cast<RibbonWidget*>(widget->m_event_handler);
if(w->getRibbonType() == RIBBON_COMBO) always_show_selection = true;
}
if(mark_selected)
const bool mark_focused = focused || (parent_focused && w != NULL && w->m_focus == widget) ||
(mark_selected && !always_show_selection && parent_focused);
if(always_show_selection && mark_selected)
{
core::rect< s32 > rect2 = rect;
rect2.UpperLeftCorner.X -= rect.getWidth() / 5;
rect2.UpperLeftCorner.Y -= rect.getHeight() / 5;
rect2.LowerRightCorner.X += rect.getWidth() / 5;
rect2.LowerRightCorner.Y += rect.getHeight() / 5;
const int texture_w = m_tex_bubble->getSize().Width;
const int texture_h = m_tex_bubble->getSize().Height;
core::rect<s32> source_area = core::rect<s32>(0, 0, texture_w, texture_h);
GUIEngine::getDriver()->draw2DImage(m_tex_bubble, rect2, source_area,
0 /* no clipping */, 0, true /* alpha */);
}
if(mark_focused)
{
if (use_glow)
{
int grow = 45;
static float glow_effect = 0;
if(focused || parent_focused)
{
const float dt = GUIEngine::getLatestDt();
glow_effect += dt*3;
if (glow_effect > 6.2832f /* 2*PI */) glow_effect -= 6.2832f;
grow = (int)(45 + 10*sin(glow_effect));
}
const float dt = GUIEngine::getLatestDt();
glow_effect += dt*3;
if (glow_effect > 6.2832f /* 2*PI */) glow_effect -= 6.2832f;
grow = (int)(45 + 10*sin(glow_effect));
const int glow_center_x = rect.UpperLeftCorner.X + rect.getWidth()/2;
const int glow_center_y = rect.UpperLeftCorner.Y + rect.getHeight() - 5;
@@ -452,30 +476,14 @@ void Skin::drawRibbonChild(const core::rect< s32 > &rect, const Widget* widget,
core::rect<s32> source_area = core::rect<s32>(0, 0, texture_w, texture_h);
const bool show_focus = focused || parent_focused;
if(always_show_selection)
{
core::rect< s32 > rect2 = rect;
rect2.UpperLeftCorner.X -= rect.getWidth() / 5;
rect2.UpperLeftCorner.Y -= rect.getHeight() / 5;
rect2.LowerRightCorner.X += rect.getWidth() / 5;
rect2.LowerRightCorner.Y += rect.getHeight() / 5;
GUIEngine::getDriver()->draw2DImage(m_tex_bubble, rect2, source_area,
0 /* no clipping */, 0, true /* alpha */);
}
if(show_focus)
{
const core::rect< s32 > rect2 = core::rect< s32 >(glow_center_x - 45 - grow,
glow_center_y - 25 - grow/2,
glow_center_x + 45 + grow,
glow_center_y + 25 + grow/2);
GUIEngine::getDriver()->draw2DImage(m_tex_ficonhighlight, rect2, source_area,
0 /* no clipping */, 0, true /* alpha */);
}
const core::rect< s32 > rect2 = core::rect< s32 >(glow_center_x - 45 - grow,
glow_center_y - 25 - grow/2,
glow_center_x + 45 + grow,
glow_center_y + 25 + grow/2);
GUIEngine::getDriver()->draw2DImage(m_tex_ficonhighlight, rect2, source_area,
0 /* no clipping */, 0, true /* alpha */);
}
/* if we're not using glow */
else
@@ -498,8 +506,9 @@ void Skin::drawRibbonChild(const core::rect< s32 > &rect, const Widget* widget,
drawBoxFromStretchableTexture(rect, m_tex_squarefocus, params);
}
} // end if mark_selected
} // end if mark_focused
}
}

11
src/gui/widget.cpp
View File

@@ -389,6 +389,7 @@ RibbonWidget::RibbonWidget(const RibbonType type)
{
m_selection = 0;
m_ribbon_type = type;
m_focus = NULL;
updateSelection();
}
// -----------------------------------------------------------------------------
@@ -421,6 +422,7 @@ bool RibbonWidget::rightPressed()
else m_selection = 0;
}
updateSelection();
m_focus = m_children.get(m_selection);
return m_ribbon_type != RIBBON_TOOLBAR;
}
@@ -438,6 +440,7 @@ bool RibbonWidget::leftPressed()
else m_selection = m_children.size()-1;
}
updateSelection();
m_focus = m_children.get(m_selection);
return m_ribbon_type != RIBBON_TOOLBAR;
}
@@ -445,18 +448,22 @@ bool RibbonWidget::leftPressed()
void RibbonWidget::focused()
{
if(m_event_handler != NULL) ((RibbonGridWidget*)m_event_handler)->updateLabel( this );
if(m_focus == NULL) m_focus = m_children.get(m_selection);
}
// -----------------------------------------------------------------------------
bool RibbonWidget::mouseHovered(Widget* child)
{
const int subbuttons_amount = m_children.size();
m_focus = child;
for(int i=0; i<subbuttons_amount; i++)
{
if(m_children.get(i) == child)
{
if(m_selection == i) return false; // was already selected, don't send another event
m_selection = i;
if(m_ribbon_type == RIBBON_TOOLBAR) m_selection = i; // don't change selection on hover for others
break;
}
}
@@ -472,6 +479,8 @@ void RibbonWidget::updateSelection()
{
m_children[i].m_selected = (i == m_selection);
}
if(subbuttons_amount > 0 && m_ribbon_type == RIBBON_TOOLBAR) m_focus = m_children.get(m_selection);
}
// -----------------------------------------------------------------------------
bool RibbonWidget::transmitEvent(Widget* w, std::string& originator)

2
src/gui/widget.hpp
View File

@@ -236,6 +236,8 @@ namespace GUIEngine
ptr_vector<IGUIStaticText, REF> m_labels;
public:
Widget* m_focus;
virtual ~RibbonWidget() {}
int getSelection() const { return m_selection; }