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

drawing improvements; empty caption w/ tab drawing looks better

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams
2006-07-24 09:28:59 +00:00
parent 82dc21d343
commit 9d59bf6889
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/aui/auibook.cpp
View File

@@ -313,7 +313,7 @@ void wxAuiTabContainer::AddButton(int id, const wxBitmap& bmp)
void wxAuiTabContainer::DrawTab(wxDC* dc, void wxAuiTabContainer::DrawTab(wxDC* dc,
const wxRect& in_rect, const wxRect& in_rect,
const wxString& caption, const wxString& _caption,
bool active, bool active,
wxRect* out_rect, wxRect* out_rect,
int* x_extent) int* x_extent)
@@ -324,6 +324,11 @@ void wxAuiTabContainer::DrawTab(wxDC* dc,
wxCoord textx, texty; wxCoord textx, texty;
// if the caption is empty, measure some temporary text
wxString caption = _caption;
if (_caption.IsEmpty())
caption = wxT("Xj");
// measure text // measure text
dc->SetFont(m_measuring_font); dc->SetFont(m_measuring_font);
dc->GetTextExtent(caption, &measured_textx, &measured_texty); dc->GetTextExtent(caption, &measured_textx, &measured_texty);
@@ -334,6 +339,7 @@ void wxAuiTabContainer::DrawTab(wxDC* dc,
dc->SetFont(m_normal_font); dc->SetFont(m_normal_font);
dc->GetTextExtent(caption, &normal_textx, &normal_texty); dc->GetTextExtent(caption, &normal_textx, &normal_texty);
caption = _caption;
wxCoord tab_height = measured_texty + 4; wxCoord tab_height = measured_texty + 4;
wxCoord tab_width = measured_textx + tab_height + 5; wxCoord tab_width = measured_textx + tab_height + 5;
@@ -824,6 +830,7 @@ public:
m_tabs->SetSize(m_rect.x, m_rect.y, m_rect.width, tab_height); m_tabs->SetSize(m_rect.x, m_rect.y, m_rect.width, tab_height);
m_tabs->SetRect(wxRect(0, 0, m_rect.width, tab_height)); m_tabs->SetRect(wxRect(0, 0, m_rect.width, tab_height));
m_tabs->Refresh(); m_tabs->Refresh();
m_tabs->Update();
wxAuiNotebookPageArray& pages = m_tabs->GetPages(); wxAuiNotebookPageArray& pages = m_tabs->GetPages();
size_t i, page_count = pages.GetCount(); size_t i, page_count = pages.GetCount();