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

aui notebook button enabling/disabling implemented

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams
2006-10-30 18:58:53 +00:00
parent 694f411c85
commit 25d7497c18
1 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/aui/auibook.cpp
View File

@@ -348,12 +348,15 @@ void wxDefaultTabArt::DrawButton(
if (orientation == wxLEFT) if (orientation == wxLEFT)
{ {
rect.SetX(in_rect.x);
rect.SetY(((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2));
rect.SetWidth(bmp.GetWidth()); rect.SetWidth(bmp.GetWidth());
rect.SetHeight(bmp.GetHeight()); rect.SetHeight(bmp.GetHeight());
} }
else else
{ {
rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(), in_rect.y, rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(),
((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
bmp.GetWidth(), bmp.GetHeight()); bmp.GetWidth(), bmp.GetHeight());
} }
@@ -624,16 +627,25 @@ void wxAuiTabContainer::Render(wxDC* raw_dc)
// find out if size of tabs is larger than can be // find out if size of tabs is larger than can be
// afforded on screen // afforded on screen
int total_width = 0; int total_width = 0;
int visible_width = 0;
for (i = 0; i < page_count; ++i) for (i = 0; i < page_count; ++i)
{ {
wxAuiNotebookPage& page = m_pages.Item(i); wxAuiNotebookPage& page = m_pages.Item(i);
int x_extent = 0; int x_extent = 0;
wxSize size = m_art->GetTabSize(&dc, page.caption, page.active, &x_extent); wxSize size = m_art->GetTabSize(&dc, page.caption, page.active, &x_extent);
if (i+1 < page_count) if (i+1 < page_count)
total_width += x_extent; total_width += x_extent;
else else
total_width += size.x; total_width += size.x;
if (i >= m_tab_offset)
{
if (i+1 < page_count)
visible_width += x_extent;
else
visible_width += size.x;
}
} }
if (total_width > m_rect.GetWidth() - 20 || m_tab_offset != 0) if (total_width > m_rect.GetWidth() - 20 || m_tab_offset != 0)
@@ -663,6 +675,26 @@ void wxAuiTabContainer::Render(wxDC* raw_dc)
} }
} }
// determine whether left button should be enabled
for (i = 0; i < button_count; ++i)
{
wxAuiTabContainerButton& button = m_buttons.Item(i);
if (button.id == wxAUI_BUTTON_LEFT)
{
if (m_tab_offset == 0)
button.cur_state |= wxAUI_BUTTON_STATE_DISABLED;
else
button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED;
}
if (button.id == wxAUI_BUTTON_RIGHT)
{
if (visible_width < m_rect.GetWidth() - ((int)button_count*16))
button.cur_state |= wxAUI_BUTTON_STATE_DISABLED;
else
button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED;
}
}
// draw background // draw background
@@ -992,10 +1024,13 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent&)
Refresh(); Refresh();
Update(); Update();
wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, m_windowId); if (!(m_hover_button->cur_state & wxAUI_BUTTON_STATE_DISABLED))
evt.SetInt(m_hover_button->id); {
evt.SetEventObject(this); wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, m_windowId);
GetEventHandler()->ProcessEvent(evt); evt.SetInt(m_hover_button->id);
evt.SetEventObject(this);
GetEventHandler()->ProcessEvent(evt);
}
} }
m_click_pt = wxDefaultPosition; m_click_pt = wxDefaultPosition;