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

Fix drawing of wxAuiNotebook with GTK theme when active tab is invisible.

Browse Source 
Draw a box using gtk_paint_box() for the tabs, without border for the active
one to avoid an extra line across the gap, and with the border for the others.

Closes #14728.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-10-07 22:37:47 +00:00
parent 4c6fdc3503
commit c072e264e6
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/aui/tabartgtk.cpp
View File

@@ -194,11 +194,8 @@ void wxAuiGtkTabArt::DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& p
if (page.active) if (page.active)
tab_rect.height += 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder; tab_rect.height += 2 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder;
// if no bitmap is set, we need a tiny correction
if (! page.bitmap.IsOk())
tab_rect.height += 1;
int gap_rect_height = 6 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder; int gap_rect_height = 10 * GTK_NOTEBOOK (wxGTKPrivate::GetNotebookWidget())->tab_hborder;
int gap_rect_x = 1, gap_start = 0, gap_width = 0; int gap_rect_x = 1, gap_start = 0, gap_width = 0;
int gap_rect_y = tab_rect.y - gap_rect_height; int gap_rect_y = tab_rect.y - gap_rect_height;
int gap_rect_width = window_rect.width; int gap_rect_width = window_rect.width;
@@ -238,6 +235,15 @@ void wxAuiGtkTabArt::DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& p
wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
GdkWindow* window = impldc->GetGDKWindow(); GdkWindow* window = impldc->GetGDKWindow();
// Before drawing the active tab itself, draw a box without border, because some themes
// have transparent gaps and a line would be visible at the bottom of the tab
if (page.active)
gtk_paint_box(style_notebook, window, GTK_STATE_NORMAL, GTK_SHADOW_NONE,
NULL, widget,
const_cast<char*>("notebook"),
gap_rect_x, gap_rect_y,
gap_rect_width, gap_rect_height);
if (tab_pos == wxAUI_NB_BOTTOM) if (tab_pos == wxAUI_NB_BOTTOM)
{ {
if (page.active) if (page.active)
@@ -277,6 +283,15 @@ void wxAuiGtkTabArt::DrawTab(wxDC& dc, wxWindow* wnd, const wxAuiNotebookPage& p
GTK_POS_BOTTOM); GTK_POS_BOTTOM);
} }
// After drawing the inactive tab itself, draw a box with the same dimensions as the gap-box,
// otherwise we don't get a gap-box, if the active tab is invisible
if (!page.active)
gtk_paint_box(style_notebook, window, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
NULL, widget,
const_cast<char*>("notebook"),
gap_rect_x, gap_rect_y,
gap_rect_width, gap_rect_height);
wxCoord textX = tab_rect.x + padding + style_notebook->xthickness; wxCoord textX = tab_rect.x + padding + style_notebook->xthickness;
int bitmap_offset = 0; int bitmap_offset = 0;