Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ribbon bar scroll buttons visibility bug.

Browse Source 
Fix scroll buttons update code in wxRibbonPage.

Closes #14844.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-11-23 14:34:31 +00:00
parent 3c3b6f6063
commit b31d6326be
1 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ribbon/page.cpp
View File

@@ -640,6 +640,8 @@ bool wxRibbonPage::DoActualLayout()
ShowScrollButtons(); ShowScrollButtons();
else if(todo_hide_scroll_buttons) else if(todo_hide_scroll_buttons)
HideScrollButtons(); HideScrollButtons();
else if(m_scroll_buttons_visible)
ShowScrollButtons();
Refresh(); Refresh();
return true; return true;
@@ -678,8 +680,6 @@ void wxRibbonPage::ShowScrollButtons()
m_scroll_buttons_visible = show_left || show_right; m_scroll_buttons_visible = show_left || show_right;
if(show_left) if(show_left)
{
if(m_scroll_left_btn == NULL)
{ {
wxMemoryDC temp_dc; wxMemoryDC temp_dc;
wxSize size; wxSize size;
@@ -696,13 +696,19 @@ void wxRibbonPage::ShowScrollButtons()
size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction); size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction);
size.SetWidth(GetSize().GetWidth()); size.SetWidth(GetSize().GetWidth());
} }
if (m_scroll_left_btn)
{
m_scroll_left_btn->SetSize(size);
}
else
{
m_scroll_left_btn = new wxRibbonPageScrollButton(this, wxID_ANY, GetPosition(), size, direction); m_scroll_left_btn = new wxRibbonPageScrollButton(this, wxID_ANY, GetPosition(), size, direction);
reposition = true;
}
if(!IsShown()) if(!IsShown())
{ {
m_scroll_left_btn->Hide(); m_scroll_left_btn->Hide();
} }
reposition = true;
}
} }
else else
{ {
@@ -715,8 +721,6 @@ void wxRibbonPage::ShowScrollButtons()
} }
if(show_right) if(show_right)
{
if(m_scroll_right_btn == NULL)
{ {
wxMemoryDC temp_dc; wxMemoryDC temp_dc;
wxSize size; wxSize size;
@@ -734,13 +738,19 @@ void wxRibbonPage::ShowScrollButtons()
size.SetWidth(GetSize().GetWidth()); size.SetWidth(GetSize().GetWidth());
} }
wxPoint initial_pos = GetPosition() + GetSize() - size; wxPoint initial_pos = GetPosition() + GetSize() - size;
if (m_scroll_right_btn)
{
m_scroll_right_btn->SetSize(size);
}
else
{
m_scroll_right_btn = new wxRibbonPageScrollButton(this, wxID_ANY, initial_pos, size, direction); m_scroll_right_btn = new wxRibbonPageScrollButton(this, wxID_ANY, initial_pos, size, direction);
reposition = true;
}
if(!IsShown()) if(!IsShown())
{ {
m_scroll_right_btn->Hide(); m_scroll_right_btn->Hide();
} }
reposition = true;
}
} }
else else
{ {