X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d606b6e9770a9f9d40acd30ce4eb4d54b8e5c3c7..bb20575e6e0f498e2766b01d77c7cf85b4bcd241:/src/aui/auibook.cpp?ds=sidebyside diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp index 87fcc78454..dc5ce84949 100644 --- a/src/aui/auibook.cpp +++ b/src/aui/auibook.cpp @@ -31,8 +31,12 @@ #include "wx/aui/tabmdi.h" #include "wx/dcbuffer.h" +#include "wx/renderer.h" + #ifdef __WXMAC__ -#include "wx/mac/carbon/private.h" +#include "wx/osx/private.h" +// for themeing support +#include #endif #include "wx/arrimpl.cpp" @@ -40,6 +44,7 @@ WX_DEFINE_OBJARRAY(wxAuiNotebookPageArray) WX_DEFINE_OBJARRAY(wxAuiTabContainerButtonArray) DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING) DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_BUTTON) @@ -47,7 +52,12 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG) DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG) DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION) DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND) - +DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN) IMPLEMENT_CLASS(wxAuiNotebook, wxControl) IMPLEMENT_CLASS(wxAuiTabCtrl, wxControl) @@ -185,10 +195,8 @@ wxAuiDefaultTabArt::wxAuiDefaultTabArt() m_fixed_tab_width = 100; m_tab_ctrl_height = 0; -#ifdef __WXMAC__ - wxBrush toolbarbrush; - toolbarbrush.MacSetTheme( kThemeBrushToolbarBackground ); - wxColor base_colour = toolbarbrush.GetColour(); +#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON + wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground)); #else wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE); #endif @@ -230,7 +238,12 @@ wxAuiDefaultTabArt::~wxAuiDefaultTabArt() wxAuiTabArt* wxAuiDefaultTabArt::Clone() { - return static_cast(new wxAuiDefaultTabArt); + wxAuiDefaultTabArt* art = new wxAuiDefaultTabArt; + art->SetNormalFont(m_normal_font); + art->SetSelectedFont(m_selected_font); + art->SetMeasuringFont(m_measuring_font); + + return art; } void wxAuiDefaultTabArt::SetFlags(unsigned int flags) @@ -274,17 +287,39 @@ void wxAuiDefaultTabArt::DrawBackground(wxDC& dc, const wxRect& rect) { // draw background - wxRect r(rect.x, rect.y, rect.width+2, rect.height-3); - wxColor top_color = wxAuiStepColour(m_base_colour, 90); - wxColor bottom_color = wxAuiStepColour(m_base_colour, 170); + + wxColor top_color = wxAuiStepColour(m_base_colour, 90); + wxColor bottom_color = wxAuiStepColour(m_base_colour, 170); + wxRect r; + + if (m_flags &wxAUI_NB_BOTTOM) + r = wxRect(rect.x, rect.y, rect.width+2, rect.height); + // TODO: else if (m_flags &wxAUI_NB_LEFT) {} + // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} + else //for wxAUI_NB_TOP + r = wxRect(rect.x, rect.y, rect.width+2, rect.height-3); + dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH); - // draw base lines - int y = rect.GetHeight(); - int w = rect.GetWidth(); - dc.SetPen(m_border_pen); - dc.SetBrush(m_base_colour_brush); - dc.DrawRectangle(-1, y-4, w+2, 4); + + // draw base lines + + dc.SetPen(m_border_pen); + int y = rect.GetHeight(); + int w = rect.GetWidth(); + + if (m_flags &wxAUI_NB_BOTTOM) + { + dc.SetBrush(wxBrush(bottom_color)); + dc.DrawRectangle(-1, 0, w+2, 4); + } + // TODO: else if (m_flags &wxAUI_NB_LEFT) {} + // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} + else //for wxAUI_NB_TOP + { + dc.SetBrush(m_base_colour_brush); + dc.DrawRectangle(-1, y-4, w+2, 4); + } } @@ -308,7 +343,7 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, { wxCoord normal_textx, normal_texty; wxCoord selected_textx, selected_texty; - wxCoord textx, texty; + wxCoord texty; // if the caption is empty, measure some temporary text wxString caption = page.caption; @@ -344,13 +379,11 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, if (page.active) { dc.SetFont(m_selected_font); - textx = selected_textx; texty = selected_texty; } - else + else { dc.SetFont(m_normal_font); - textx = normal_textx; texty = normal_texty; } @@ -383,13 +416,26 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, wxPoint border_points[6]; - border_points[0] = wxPoint(tab_x, tab_y+tab_height-4); - border_points[1] = wxPoint(tab_x, tab_y+2); - border_points[2] = wxPoint(tab_x+2, tab_y); - border_points[3] = wxPoint(tab_x+tab_width-2, tab_y); - border_points[4] = wxPoint(tab_x+tab_width, tab_y+2); - border_points[5] = wxPoint(tab_x+tab_width, tab_y+tab_height-4); - + if (m_flags &wxAUI_NB_BOTTOM) + { + border_points[0] = wxPoint(tab_x, tab_y); + border_points[1] = wxPoint(tab_x, tab_y+tab_height-6); + border_points[2] = wxPoint(tab_x+2, tab_y+tab_height-4); + border_points[3] = wxPoint(tab_x+tab_width-2, tab_y+tab_height-4); + border_points[4] = wxPoint(tab_x+tab_width, tab_y+tab_height-6); + border_points[5] = wxPoint(tab_x+tab_width, tab_y); + } + else //if (m_flags & wxAUI_NB_TOP) {} + { + border_points[0] = wxPoint(tab_x, tab_y+tab_height-4); + border_points[1] = wxPoint(tab_x, tab_y+2); + border_points[2] = wxPoint(tab_x+2, tab_y); + border_points[3] = wxPoint(tab_x+tab_width-2, tab_y); + border_points[4] = wxPoint(tab_x+tab_width, tab_y+2); + border_points[5] = wxPoint(tab_x+tab_width, tab_y+tab_height-4); + } + // TODO: else if (m_flags &wxAUI_NB_LEFT) {} + // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} int drawn_tab_yoff = border_points[1].y; int drawn_tab_height = border_points[0].y - border_points[1].y; @@ -427,7 +473,7 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, wxColor bottom_color = m_base_colour; dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH); } - else + else { // draw inactive tab @@ -465,8 +511,12 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, // this gets rid of the top one of those lines in the tab control if (page.active) { - wxColor start_color = m_base_colour; - dc.SetPen(m_base_colour_pen); + if (m_flags &wxAUI_NB_BOTTOM) + dc.SetPen(wxPen(wxColour(wxAuiStepColour(m_base_colour, 170)))); + // TODO: else if (m_flags &wxAUI_NB_LEFT) {} + // TODO: else if (m_flags &wxAUI_NB_RIGHT) {} + else //for wxAUI_NB_TOP + dc.SetPen(m_base_colour_pen); dc.DrawLine(border_points[0].x+1, border_points[0].y, border_points[5].x, @@ -481,10 +531,10 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, close_button_width = m_active_close_bmp.GetWidth(); } - + int bitmap_offset = 0; if (page.bitmap.IsOk()) { - int bitmap_offset = tab_x + 8; + bitmap_offset = tab_x + 8; // draw bitmap dc.DrawBitmap(page.bitmap, @@ -494,8 +544,9 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, text_offset = bitmap_offset + page.bitmap.GetWidth(); text_offset += 3; // bitmap padding + } - else + else { text_offset = tab_x + 8; } @@ -510,8 +561,30 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc, text_offset, drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1); + // draw focus rectangle + if (page.active && (wnd->FindFocus() == wnd)) + { + wxRect focusRectText(text_offset, (drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1), + selected_textx, selected_texty); + + wxRect focusRect; + wxRect focusRectBitmap; + + if (page.bitmap.IsOk()) + focusRectBitmap = wxRect(bitmap_offset, drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2), + page.bitmap.GetWidth(), page.bitmap.GetHeight()); + if (page.bitmap.IsOk() && draw_text.IsEmpty()) + focusRect = focusRectBitmap; + else if (!page.bitmap.IsOk() && !draw_text.IsEmpty()) + focusRect = focusRectText; + else if (page.bitmap.IsOk() && !draw_text.IsEmpty()) + focusRect = focusRectText.Union(focusRectBitmap); + focusRect.Inflate(2, 2); + + wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0); + } // draw close button if necessary if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) @@ -606,25 +679,25 @@ void wxAuiDefaultTabArt::DrawButton(wxDC& dc, case wxAUI_BUTTON_CLOSE: if (button_state & wxAUI_BUTTON_STATE_DISABLED) bmp = m_disabled_close_bmp; - else + else bmp = m_active_close_bmp; break; case wxAUI_BUTTON_LEFT: if (button_state & wxAUI_BUTTON_STATE_DISABLED) bmp = m_disabled_left_bmp; - else + else bmp = m_active_left_bmp; break; case wxAUI_BUTTON_RIGHT: if (button_state & wxAUI_BUTTON_STATE_DISABLED) bmp = m_disabled_right_bmp; - else + else bmp = m_active_right_bmp; break; case wxAUI_BUTTON_WINDOWLIST: if (button_state & wxAUI_BUTTON_STATE_DISABLED) bmp = m_disabled_windowlist_bmp; - else + else bmp = m_active_windowlist_bmp; break; } @@ -642,7 +715,7 @@ void wxAuiDefaultTabArt::DrawButton(wxDC& dc, rect.SetWidth(bmp.GetWidth()); rect.SetHeight(bmp.GetHeight()); } - else + else { rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(), ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2), @@ -655,7 +728,6 @@ void wxAuiDefaultTabArt::DrawButton(wxDC& dc, *out_rect = rect; } - int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd, const wxAuiNotebookPageArray& pages, int active_idx) @@ -666,7 +738,14 @@ int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd, for (i = 0; i < count; ++i) { const wxAuiNotebookPage& page = pages.Item(i); - menuPopup.AppendCheckItem(1000+i, page.caption); + wxString caption = page.caption; + + // if there is no caption, make it a space. This will prevent + // an assert in the menu code. + if (caption.IsEmpty()) + caption = wxT(" "); + + menuPopup.AppendCheckItem(1000+i, caption); } if (active_idx != -1) @@ -721,7 +800,7 @@ int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd, wxBitmap bmp; if (measure_bmp.IsOk()) bmp = measure_bmp; - else + else bmp = page.bitmap; // we don't use the caption text because we don't @@ -914,7 +993,7 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc, textx = selected_textx; texty = selected_texty; } - else + else { dc.SetPen(m_normal_bkpen); dc.SetBrush(m_normal_bkbrush); @@ -959,7 +1038,7 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc, close_button_width = m_active_close_bmp.GetWidth(); text_offset = tab_x + (tab_height/2) + ((tab_width-close_button_width)/2) - (textx/2); } - else + else { text_offset = tab_x + (tab_height/3) + (tab_width/2) - (textx/2); } @@ -979,13 +1058,24 @@ void wxAuiSimpleTabArt::DrawTab(wxDC& dc, (tab_y + tab_height)/2 - (texty/2) + 1); + // draw focus rectangle + if (page.active && (wnd->FindFocus() == wnd)) + { + wxRect focusRect(text_offset, ((tab_y + tab_height)/2 - (texty/2) + 1), + selected_textx, selected_texty); + + focusRect.Inflate(2, 2); + + wxRendererNative::Get().DrawFocusRect(wnd, dc, focusRect, 0); + } + // draw close button if necessary if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) { wxBitmap bmp; if (page.active) bmp = m_active_close_bmp; - else + else bmp = m_disabled_close_bmp; wxRect rect(tab_x + tab_width - close_button_width - 1, @@ -1054,25 +1144,25 @@ void wxAuiSimpleTabArt::DrawButton(wxDC& dc, case wxAUI_BUTTON_CLOSE: if (button_state & wxAUI_BUTTON_STATE_DISABLED) bmp = m_disabled_close_bmp; - else + else bmp = m_active_close_bmp; break; case wxAUI_BUTTON_LEFT: if (button_state & wxAUI_BUTTON_STATE_DISABLED) bmp = m_disabled_left_bmp; - else + else bmp = m_active_left_bmp; break; case wxAUI_BUTTON_RIGHT: if (button_state & wxAUI_BUTTON_STATE_DISABLED) bmp = m_disabled_right_bmp; - else + else bmp = m_active_right_bmp; break; case wxAUI_BUTTON_WINDOWLIST: if (button_state & wxAUI_BUTTON_STATE_DISABLED) bmp = m_disabled_windowlist_bmp; - else + else bmp = m_active_windowlist_bmp; break; } @@ -1089,7 +1179,7 @@ void wxAuiSimpleTabArt::DrawButton(wxDC& dc, rect.SetWidth(bmp.GetWidth()); rect.SetHeight(bmp.GetHeight()); } - else + else { rect = wxRect(in_rect.x + in_rect.width - bmp.GetWidth(), ((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2), @@ -1102,7 +1192,6 @@ void wxAuiSimpleTabArt::DrawButton(wxDC& dc, *out_rect = rect; } - int wxAuiSimpleTabArt::ShowDropDown(wxWindow* wnd, const wxAuiNotebookPageArray& pages, int active_idx) @@ -1128,7 +1217,7 @@ int wxAuiSimpleTabArt::ShowDropDown(wxWindow* wnd, pt = wnd->ScreenToClient(pt); if (pt.x < 100) pt.x = 0; - else + else pt.x -= 100; // find out the screen coordinate at the bottom of the tab ctrl @@ -1320,7 +1409,7 @@ bool wxAuiTabContainer::InsertPage(wxWindow* page, if (idx >= m_pages.GetCount()) m_pages.Add(page_info); - else + else m_pages.Insert(page_info, idx); // let the art provider know how many pages we have @@ -1387,7 +1476,7 @@ bool wxAuiTabContainer::SetActivePage(wxWindow* wnd) page.active = true; found = true; } - else + else { page.active = false; } @@ -1437,14 +1526,14 @@ wxWindow* wxAuiTabContainer::GetWindowFromIdx(size_t idx) const int wxAuiTabContainer::GetIdxFromWindow(wxWindow* wnd) const { - size_t i, page_count = m_pages.GetCount(); - for (i = 0; i < page_count; ++i) + const size_t page_count = m_pages.GetCount(); + for ( size_t i = 0; i < page_count; ++i ) { wxAuiNotebookPage& page = m_pages.Item(i); if (page.window == wnd) return i; } - return -1; + return wxNOT_FOUND; } wxAuiNotebookPage& wxAuiTabContainer::GetPage(size_t idx) @@ -1524,6 +1613,11 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) return; wxMemoryDC dc; + + // use the same layout direction as the window DC uses to ensure that the + // text is rendered correctly + dc.SetLayoutDirection(raw_dc->GetLayoutDirection()); + wxBitmap bmp; size_t i; size_t page_count = m_pages.GetCount(); @@ -1566,14 +1660,14 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) if (i+1 < page_count) total_width += x_extent; - else + else total_width += size.x; if (i >= m_tab_offset) { if (i+1 < page_count) visible_width += x_extent; - else + else visible_width += size.x; } } @@ -1591,7 +1685,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) } } } - else + else { // hide left/right buttons for (i = 0; i < button_count; ++i) @@ -1613,14 +1707,14 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) { if (m_tab_offset == 0) button.cur_state |= wxAUI_BUTTON_STATE_DISABLED; - else + 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 + else button.cur_state &= ~wxAUI_BUTTON_STATE_DISABLED; } } @@ -1738,11 +1832,9 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(i); // determine if a close button is on this tab - bool close_button = false; if ((m_flags & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0 || ((m_flags & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0 && page.active)) { - close_button = true; if (tab_button.cur_state == wxAUI_BUTTON_STATE_HIDDEN) { tab_button.id = wxAUI_BUTTON_CLOSE; @@ -1750,7 +1842,7 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) tab_button.location = wxCENTER; } } - else + else { tab_button.cur_state = wxAUI_BUTTON_STATE_HIDDEN; } @@ -1795,14 +1887,6 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(active); - // determine if a close button is on this tab - bool close_button = false; - if ((m_flags & wxAUI_NB_CLOSE_ON_ALL_TABS) != 0 || - ((m_flags & wxAUI_NB_CLOSE_ON_ACTIVE_TAB) != 0 && page.active)) - { - close_button = true; - } - rect.x = active_offset; m_art->DrawTab(dc, wnd, @@ -1820,6 +1904,147 @@ void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd) &dc, 0, 0); } +// Is the tab visible? +bool wxAuiTabContainer::IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd) +{ + if (!dc || !dc->IsOk()) + return false; + + size_t i; + size_t page_count = m_pages.GetCount(); + size_t button_count = m_buttons.GetCount(); + + // Hasn't been rendered yet; assume it's visible + if (m_tab_close_buttons.GetCount() < page_count) + return true; + + // First check if both buttons are disabled - if so, there's no need to + // check further for visibility. + int arrowButtonVisibleCount = 0; + for (i = 0; i < button_count; ++i) + { + wxAuiTabContainerButton& button = m_buttons.Item(i); + if (button.id == wxAUI_BUTTON_LEFT || + button.id == wxAUI_BUTTON_RIGHT) + { + if ((button.cur_state & wxAUI_BUTTON_STATE_HIDDEN) == 0) + arrowButtonVisibleCount ++; + } + } + + // Tab must be visible + if (arrowButtonVisibleCount == 0) + return true; + + // If tab is less than the given offset, it must be invisible by definition + if (tabPage < tabOffset) + return false; + + // draw buttons + int left_buttons_width = 0; + int right_buttons_width = 0; + + int offset = 0; + + // calculate size of the buttons on the right side + offset = m_rect.x + m_rect.width; + for (i = 0; i < button_count; ++i) + { + wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1); + + if (button.location != wxRIGHT) + continue; + if (button.cur_state & wxAUI_BUTTON_STATE_HIDDEN) + continue; + + offset -= button.rect.GetWidth(); + right_buttons_width += button.rect.GetWidth(); + } + + offset = 0; + + // calculate size of the buttons on the left side + for (i = 0; i < button_count; ++i) + { + wxAuiTabContainerButton& button = m_buttons.Item(button_count - i - 1); + + if (button.location != wxLEFT) + continue; + if (button.cur_state & wxAUI_BUTTON_STATE_HIDDEN) + continue; + + offset += button.rect.GetWidth(); + left_buttons_width += button.rect.GetWidth(); + } + + offset = left_buttons_width; + + if (offset == 0) + offset += m_art->GetIndentSize(); + + wxRect active_rect; + + wxRect rect = m_rect; + rect.y = 0; + rect.height = m_rect.height; + + // See if the given page is visible at the given tab offset (effectively scroll position) + for (i = tabOffset; i < page_count; ++i) + { + wxAuiNotebookPage& page = m_pages.Item(i); + wxAuiTabContainerButton& tab_button = m_tab_close_buttons.Item(i); + + rect.x = offset; + rect.width = m_rect.width - right_buttons_width - offset - 2; + + if (rect.width <= 0) + return false; // haven't found the tab, and we've run out of space, so return false + + int x_extent = 0; + wxSize size = m_art->GetTabSize(*dc, + wnd, + page.caption, + page.bitmap, + page.active, + tab_button.cur_state, + &x_extent); + + offset += x_extent; + + if (i == (size_t) tabPage) + { + // If not all of the tab is visible, and supposing there's space to display it all, + // we could do better so we return false. + if (((m_rect.width - right_buttons_width - offset - 2) <= 0) && ((m_rect.width - right_buttons_width - left_buttons_width) > x_extent)) + return false; + else + return true; + } + } + + // Shouldn't really get here, but if it does, assume the tab is visible to prevent + // further looping in calling code. + return true; +} + +// Make the tab visible if it wasn't already +void wxAuiTabContainer::MakeTabVisible(int tabPage, wxWindow* win) +{ + wxClientDC dc(win); + if (!IsTabVisible(tabPage, GetTabOffset(), & dc, win)) + { + int i; + for (i = 0; i < (int) m_pages.GetCount(); i++) + { + if (IsTabVisible(tabPage, i, & dc, win)) + { + SetTabOffset(i); + win->Refresh(); + return; + } + } + } +} // TabHitTest() tests if a tab was hit, passing the window pointer // back if that condition was fulfilled. The function returns @@ -1901,12 +2126,14 @@ bool wxAuiTabContainer::ButtonHitTest(int x, int y, // as the Show() method on this class is "unplugged" static void ShowWnd(wxWindow* wnd, bool show) { +#if wxUSE_MDI if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame))) { wxAuiMDIChildFrame* cf = (wxAuiMDIChildFrame*)wnd; cf->DoShow(show); } - else + else +#endif { wnd->Show(show); } @@ -1935,7 +2162,8 @@ void wxAuiTabContainer::DoShowHide() for (i = 0; i < page_count; ++i) { wxAuiNotebookPage& page = pages.Item(i); - ShowWnd(page.window, page.active); + if (!page.active) + ShowWnd(page.window, false); } } @@ -1953,11 +2181,19 @@ BEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl) EVT_ERASE_BACKGROUND(wxAuiTabCtrl::OnEraseBackground) EVT_SIZE(wxAuiTabCtrl::OnSize) EVT_LEFT_DOWN(wxAuiTabCtrl::OnLeftDown) - EVT_LEFT_DCLICK(wxAuiTabCtrl::OnLeftDown) + EVT_LEFT_DCLICK(wxAuiTabCtrl::OnLeftDClick) EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp) + EVT_MIDDLE_DOWN(wxAuiTabCtrl::OnMiddleDown) + EVT_MIDDLE_UP(wxAuiTabCtrl::OnMiddleUp) + EVT_RIGHT_DOWN(wxAuiTabCtrl::OnRightDown) + EVT_RIGHT_UP(wxAuiTabCtrl::OnRightUp) EVT_MOTION(wxAuiTabCtrl::OnMotion) EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow) EVT_AUINOTEBOOK_BUTTON(wxID_ANY, wxAuiTabCtrl::OnButton) + EVT_SET_FOCUS(wxAuiTabCtrl::OnSetFocus) + EVT_KILL_FOCUS(wxAuiTabCtrl::OnKillFocus) + EVT_CHAR(wxAuiTabCtrl::OnChar) + EVT_MOUSE_CAPTURE_LOST(wxAuiTabCtrl::OnCaptureLost) END_EVENT_TABLE() @@ -1967,6 +2203,7 @@ wxAuiTabCtrl::wxAuiTabCtrl(wxWindow* parent, const wxSize& size, long style) : wxControl(parent, id, pos, size, style) { + SetName(wxT("wxAuiTabCtrl")); m_click_pt = wxDefaultPosition; m_is_dragging = false; m_hover_button = NULL; @@ -2039,6 +2276,10 @@ void wxAuiTabCtrl::OnLeftDown(wxMouseEvent& evt) } } +void wxAuiTabCtrl::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event)) +{ +} + void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt) { if (GetCapture() == this) @@ -2046,11 +2287,14 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt) if (m_is_dragging) { + m_is_dragging = false; + wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, m_windowId); evt.SetSelection(GetIdxFromWindow(m_click_tab)); evt.SetOldSelection(evt.GetSelection()); evt.SetEventObject(this); GetEventHandler()->ProcessEvent(evt); + return; } @@ -2073,6 +2317,7 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt) if (!(m_pressed_button->cur_state & wxAUI_BUTTON_STATE_DISABLED)) { wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, m_windowId); + evt.SetSelection(GetIdxFromWindow(m_click_tab)); evt.SetInt(m_pressed_button->id); evt.SetEventObject(this); GetEventHandler()->ProcessEvent(evt); @@ -2086,6 +2331,66 @@ void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt) m_click_tab = NULL; } +void wxAuiTabCtrl::OnMiddleUp(wxMouseEvent& evt) +{ + wxWindow* wnd = NULL; + if (!TabHitTest(evt.m_x, evt.m_y, &wnd)) + return; + + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, m_windowId); + e.SetEventObject(this); + e.SetSelection(GetIdxFromWindow(wnd)); + GetEventHandler()->ProcessEvent(e); +} + +void wxAuiTabCtrl::OnMiddleDown(wxMouseEvent& evt) +{ + wxWindow* wnd = NULL; + if (!TabHitTest(evt.m_x, evt.m_y, &wnd)) + return; + + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, m_windowId); + e.SetEventObject(this); + e.SetSelection(GetIdxFromWindow(wnd)); + GetEventHandler()->ProcessEvent(e); +} + +void wxAuiTabCtrl::OnRightUp(wxMouseEvent& evt) +{ + wxWindow* wnd = NULL; + if (!TabHitTest(evt.m_x, evt.m_y, &wnd)) + return; + + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, m_windowId); + e.SetEventObject(this); + e.SetSelection(GetIdxFromWindow(wnd)); + GetEventHandler()->ProcessEvent(e); +} + +void wxAuiTabCtrl::OnRightDown(wxMouseEvent& evt) +{ + wxWindow* wnd = NULL; + if (!TabHitTest(evt.m_x, evt.m_y, &wnd)) + return; + + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, m_windowId); + e.SetEventObject(this); + e.SetSelection(GetIdxFromWindow(wnd)); + GetEventHandler()->ProcessEvent(e); +} + +void wxAuiTabCtrl::OnLeftDClick(wxMouseEvent& evt) +{ + wxWindow* wnd; + wxAuiTabContainerButton* button; + if (!TabHitTest(evt.m_x, evt.m_y, &wnd) && !ButtonHitTest(evt.m_x, evt.m_y, &button)) + { + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, m_windowId); + e.SetEventObject(this); + GetEventHandler()->ProcessEvent(e); + } +} + void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt) { wxPoint pos = evt.GetPosition(); @@ -2111,7 +2416,7 @@ void wxAuiTabCtrl::OnMotion(wxMouseEvent& evt) return; } } - else + else { if (m_hover_button) { @@ -2179,14 +2484,14 @@ void wxAuiTabCtrl::OnButton(wxAuiNotebookEvent& event) Update(); } } - else + else { SetTabOffset(GetTabOffset()+1); Refresh(); Update(); } } - else if (button == wxAUI_BUTTON_WINDOWLIST) + else if (button == wxAUI_BUTTON_WINDOWLIST) { int idx = GetArtProvider()->ShowDropDown(this, m_pages, GetActivePage()); @@ -2199,10 +2504,143 @@ void wxAuiTabCtrl::OnButton(wxAuiNotebookEvent& event) GetEventHandler()->ProcessEvent(e); } } - else + else + { + event.Skip(); + } +} + +void wxAuiTabCtrl::OnSetFocus(wxFocusEvent& WXUNUSED(event)) +{ + Refresh(); +} + +void wxAuiTabCtrl::OnKillFocus(wxFocusEvent& WXUNUSED(event)) +{ + Refresh(); +} + +void wxAuiTabCtrl::OnChar(wxKeyEvent& event) +{ + if (GetActivePage() == -1) { event.Skip(); + return; + } + + // We can't leave tab processing to the system; on Windows, tabs and keys + // get eaten by the system and not processed properly if we specify both + // wxTAB_TRAVERSAL and wxWANTS_CHARS. And if we specify just wxTAB_TRAVERSAL, + // we don't key arrow key events. + + int key = event.GetKeyCode(); + + if (key == WXK_NUMPAD_PAGEUP) + key = WXK_PAGEUP; + if (key == WXK_NUMPAD_PAGEDOWN) + key = WXK_PAGEDOWN; + if (key == WXK_NUMPAD_HOME) + key = WXK_HOME; + if (key == WXK_NUMPAD_END) + key = WXK_END; + if (key == WXK_NUMPAD_LEFT) + key = WXK_LEFT; + if (key == WXK_NUMPAD_RIGHT) + key = WXK_RIGHT; + + if (key == WXK_TAB || key == WXK_PAGEUP || key == WXK_PAGEDOWN) + { + bool bCtrlDown = event.ControlDown(); + bool bShiftDown = event.ShiftDown(); + + bool bForward = (key == WXK_TAB && !bShiftDown) || (key == WXK_PAGEDOWN); + bool bWindowChange = (key == WXK_PAGEUP) || (key == WXK_PAGEDOWN) || bCtrlDown; + bool bFromTab = (key == WXK_TAB); + + wxAuiNotebook* nb = wxDynamicCast(GetParent(), wxAuiNotebook); + if (!nb) + { + event.Skip(); + return; + } + + wxNavigationKeyEvent keyEvent; + keyEvent.SetDirection(bForward); + keyEvent.SetWindowChange(bWindowChange); + keyEvent.SetFromTab(bFromTab); + keyEvent.SetEventObject(nb); + + if (!nb->GetEventHandler()->ProcessEvent(keyEvent)) + { + // Not processed? Do an explicit tab into the page. + wxWindow* win = GetWindowFromIdx(GetActivePage()); + if (win) + win->SetFocus(); + } + return; + } + + if (m_pages.GetCount() < 2) + { + event.Skip(); + return; + } + + int newPage = -1; + + int forwardKey, backwardKey; + if (GetLayoutDirection() == wxLayout_RightToLeft) + { + forwardKey = WXK_LEFT; + backwardKey = WXK_RIGHT; + } + else + { + forwardKey = WXK_RIGHT; + backwardKey = WXK_LEFT; + } + + if (key == forwardKey) + { + if (m_pages.GetCount() > 1) + { + if (GetActivePage() == -1) + newPage = 0; + else if (GetActivePage() < (int) (m_pages.GetCount() - 1)) + newPage = GetActivePage() + 1; + } + } + else if (key == backwardKey) + { + if (m_pages.GetCount() > 1) + { + if (GetActivePage() == -1) + newPage = (int) (m_pages.GetCount() - 1); + else if (GetActivePage() > 0) + newPage = GetActivePage() - 1; + } + } + else if (key == WXK_HOME) + { + newPage = 0; + } + else if (key == WXK_END) + { + newPage = (int) (m_pages.GetCount() - 1); + } + else + event.Skip(); + + if (newPage != -1) + { + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId); + e.SetSelection(newPage); + e.SetOldSelection(newPage); + e.SetEventObject(this); + this->GetEventHandler()->ProcessEvent(e); } + else + event.Skip(); } // wxTabFrame is an interesting case. It's important that all child pages @@ -2224,11 +2662,17 @@ public: m_tab_ctrl_height = 20; } + ~wxTabFrame() + { + wxDELETE(m_tabs); + } + void SetTabCtrlHeight(int h) { m_tab_ctrl_height = h; } +protected: void DoSetSize(int x, int y, int width, int height, int WXUNUSED(sizeFlags = wxSIZE_AUTO)) @@ -2243,6 +2687,7 @@ public: *y = m_rect.height; } +public: bool Show( bool WXUNUSED(show = true) ) { return false; } void DoSizing() @@ -2251,8 +2696,21 @@ public: return; m_tab_rect = wxRect(m_rect.x, m_rect.y, m_rect.width, m_tab_ctrl_height); - m_tabs->SetSize(m_rect.x, m_rect.y, m_rect.width, m_tab_ctrl_height); - m_tabs->SetRect(wxRect(0, 0, m_rect.width, m_tab_ctrl_height)); + if (m_tabs->GetFlags() & wxAUI_NB_BOTTOM) + { + m_tab_rect = wxRect (m_rect.x, m_rect.y + m_rect.height - m_tab_ctrl_height, m_rect.width, m_tab_ctrl_height); + m_tabs->SetSize (m_rect.x, m_rect.y + m_rect.height - m_tab_ctrl_height, m_rect.width, m_tab_ctrl_height); + m_tabs->SetRect (wxRect(0, 0, m_rect.width, m_tab_ctrl_height)); + } + else //TODO: if (GetFlags() & wxAUI_NB_TOP) + { + m_tab_rect = wxRect (m_rect.x, m_rect.y, m_rect.width, m_tab_ctrl_height); + m_tabs->SetSize (m_rect.x, m_rect.y, m_rect.width, m_tab_ctrl_height); + m_tabs->SetRect (wxRect(0, 0, m_rect.width, m_tab_ctrl_height)); + } + // TODO: else if (GetFlags() & wxAUI_NB_LEFT){} + // TODO: else if (GetFlags() & wxAUI_NB_RIGHT){} + m_tabs->Refresh(); m_tabs->Update(); @@ -2261,18 +2719,38 @@ public: for (i = 0; i < page_count; ++i) { + int height = m_rect.height - m_tab_ctrl_height; + if ( height < 0 ) + { + // avoid passing negative height to wxWindow::SetSize(), this + // results in assert failures/GTK+ warnings + height = 0; + } + wxAuiNotebookPage& page = pages.Item(i); - page.window->SetSize(m_rect.x, m_rect.y + m_tab_ctrl_height, - m_rect.width, m_rect.height - m_tab_ctrl_height); + if (m_tabs->GetFlags() & wxAUI_NB_BOTTOM) + { + page.window->SetSize(m_rect.x, m_rect.y, m_rect.width, height); + } + else //TODO: if (GetFlags() & wxAUI_NB_TOP) + { + page.window->SetSize(m_rect.x, m_rect.y + m_tab_ctrl_height, + m_rect.width, height); + } + // TODO: else if (GetFlags() & wxAUI_NB_LEFT){} + // TODO: else if (GetFlags() & wxAUI_NB_RIGHT){} +#if wxUSE_MDI if (page.window->IsKindOf(CLASSINFO(wxAuiMDIChildFrame))) { wxAuiMDIChildFrame* wnd = (wxAuiMDIChildFrame*)page.window; wnd->ApplyMDIChildFrameRect(); } +#endif } } +protected: void DoGetSize(int* x, int* y) const { if (x) @@ -2281,13 +2759,12 @@ public: *y = m_rect.GetHeight(); } +public: void Update() { // does nothing } -public: - wxRect m_rect; wxRect m_tab_rect; wxAuiTabCtrl* m_tabs; @@ -2302,7 +2779,7 @@ const int wxAuiBaseTabCtrlId = 5380; BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl) EVT_SIZE(wxAuiNotebook::OnSize) - EVT_CHILD_FOCUS(wxAuiNotebook::OnChildFocus) + EVT_CHILD_FOCUS(wxAuiNotebook::OnChildFocusNotebook) EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, wxAuiNotebook::OnTabClicked) @@ -2318,8 +2795,33 @@ BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl) EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, wxEVT_COMMAND_AUINOTEBOOK_BUTTON, wxAuiNotebook::OnTabButton) + EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, + wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, + wxAuiNotebook::OnTabMiddleDown) + EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, + wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, + wxAuiNotebook::OnTabMiddleUp) + EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, + wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, + wxAuiNotebook::OnTabRightDown) + EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, + wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, + wxAuiNotebook::OnTabRightUp) + EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500, + wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, + wxAuiNotebook::OnTabBgDClick) + EVT_NAVIGATION_KEY(wxAuiNotebook::OnNavigationKeyNotebook) + +#ifdef wxHAS_NATIVE_TAB_TRAVERSAL + WX_EVENT_TABLE_CONTROL_CONTAINER(wxAuiNotebook) +#else + // Avoid clash with container event handler functions + EVT_SET_FOCUS(wxAuiNotebook::OnFocus) +#endif END_EVENT_TABLE() +WX_DELEGATE_TO_CONTROL_CONTAINER(wxAuiNotebook, wxControl) + wxAuiNotebook::wxAuiNotebook() { m_curpage = -1; @@ -2360,6 +2862,10 @@ bool wxAuiNotebook::Create(wxWindow* parent, // code called by all constructors void wxAuiNotebook::InitNotebook(long style) { + WX_INIT_CONTROL_CONTAINER(); + // SetCanFocus(false); + + SetName(wxT("wxAuiNotebook")); m_curpage = -1; m_tab_id_counter = wxAuiBaseTabCtrlId; m_dummy_wnd = NULL; @@ -2388,6 +2894,12 @@ void wxAuiNotebook::InitNotebook(long style) wxAuiNotebook::~wxAuiNotebook() { + // Indicate we're deleting pages + m_isBeingDeleted = true; + + while ( GetPageCount() > 0 ) + DeletePage(0); + m_mgr.UnInit(); } @@ -2506,7 +3018,7 @@ wxSize wxAuiNotebook::CalculateNewSplitSize() new_split_size.x /= 2; new_split_size.y /= 2; } - else + else { // this is in place of a more complicated calculation // that needs to be implemented @@ -2581,6 +3093,12 @@ bool wxAuiNotebook::InsertPage(size_t page_idx, bool select, const wxBitmap& bitmap) { + wxASSERT_MSG(page, wxT("page pointer must be non-NULL")); + if (!page) + return false; + + page->Reparent(this); + wxAuiNotebookPage info; info.window = page; info.caption = caption; @@ -2598,24 +3116,26 @@ bool wxAuiNotebook::InsertPage(size_t page_idx, // select is false, it must become the "current page" // (though no select events will be fired) if (!select && m_tabs.GetPageCount() == 1) - m_curpage = GetPageIndex(page); + select = true; + //m_curpage = GetPageIndex(page); wxAuiTabCtrl* active_tabctrl = GetActiveTabCtrl(); if (page_idx >= active_tabctrl->GetPageCount()) active_tabctrl->AddPage(page, info); - else + else active_tabctrl->InsertPage(page, info, page_idx); UpdateTabCtrlHeight(); DoSizing(); active_tabctrl->DoShowHide(); + // adjust selected index + if(m_curpage >= (int) page_idx) + m_curpage++; + if (select) { - int idx = m_tabs.GetIdxFromWindow(page); - wxASSERT_MSG(idx != -1, wxT("Invalid Page index returned on wxAuiNotebook::InsertPage()")); - - SetSelection(idx); + SetSelectionToWindow(page); } return true; @@ -2626,11 +3146,19 @@ bool wxAuiNotebook::InsertPage(size_t page_idx, // and destroys the window as well bool wxAuiNotebook::DeletePage(size_t page_idx) { + if (page_idx >= m_tabs.GetPageCount()) + return false; + wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx); + // hide the window in advance, as this will + // prevent flicker + ShowWnd(wnd, false); + if (!RemovePage(page_idx)) return false; +#if wxUSE_MDI // actually destroy the window now if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame))) { @@ -2639,7 +3167,8 @@ bool wxAuiNotebook::DeletePage(size_t page_idx) if (!wxPendingDelete.Member(wnd)) wxPendingDelete.Append(wnd); } - else + else +#endif { wnd->Destroy(); } @@ -2653,55 +3182,89 @@ bool wxAuiNotebook::DeletePage(size_t page_idx) // but does not destroy the window bool wxAuiNotebook::RemovePage(size_t page_idx) { + // save active window pointer + wxWindow* active_wnd = NULL; + if (m_curpage >= 0) + active_wnd = m_tabs.GetWindowFromIdx(m_curpage); + + // save pointer of window being deleted wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx); wxWindow* new_active = NULL; + // make sure we found the page + if (!wnd) + return false; + // find out which onscreen tab ctrl owns this tab wxAuiTabCtrl* ctrl; int ctrl_idx; if (!FindTab(wnd, &ctrl, &ctrl_idx)) return false; - // find a new page and set it as active - int new_idx = ctrl_idx+1; - if (new_idx >= (int)ctrl->GetPageCount()) - new_idx = ctrl_idx-1; + bool is_curpage = (m_curpage == (int)page_idx); + bool is_active_in_split = ctrl->GetPage(ctrl_idx).active; - if (new_idx >= 0 && new_idx < (int)ctrl->GetPageCount()) - { - new_active = ctrl->GetWindowFromIdx(new_idx); - } - else + + // remove the tab from main catalog + if (!m_tabs.RemovePage(wnd)) + return false; + + // remove the tab from the onscreen tab ctrl + ctrl->RemovePage(wnd); + + if (is_active_in_split) { - // set the active page to the first page that - // isn't the one being deleted - size_t i, page_count = m_tabs.GetPageCount(); - for (i = 0; i < page_count; ++i) + int ctrl_new_page_count = (int)ctrl->GetPageCount(); + + if (ctrl_idx >= ctrl_new_page_count) + ctrl_idx = ctrl_new_page_count-1; + + if (ctrl_idx >= 0 && ctrl_idx < (int)ctrl->GetPageCount()) { - wxWindow* w = m_tabs.GetWindowFromIdx(i); - if (wnd != w) + // set new page as active in the tab split + ctrl->SetActivePage(ctrl_idx); + + // if the page deleted was the current page for the + // entire tab control, then record the window + // pointer of the new active page for activation + if (is_curpage) { - new_active = m_tabs.GetWindowFromIdx(i); - break; + new_active = ctrl->GetWindowFromIdx(ctrl_idx); } } } + else + { + // we are not deleting the active page, so keep it the same + new_active = active_wnd; + } - // remove the tab from main catalog - if (!m_tabs.RemovePage(wnd)) - return false; - // remove the tab from the onscreen tab ctrl - ctrl->RemovePage(wnd); + if (!new_active) + { + // we haven't yet found a new page to active, + // so select the next page from the main tab + // catalogue + + if (page_idx < m_tabs.GetPageCount()) + { + new_active = m_tabs.GetPage(page_idx).window; + } + + if (!new_active && m_tabs.GetPageCount() > 0) + { + new_active = m_tabs.GetPage(0).window; + } + } RemoveEmptyTabFrames(); // set new active pane - if (new_active) + if (new_active && !m_isBeingDeleted) { m_curpage = -1; - SetSelection(m_tabs.GetIdxFromWindow(new_active)); + SetSelectionToWindow(new_active); } return true; @@ -2797,14 +3360,24 @@ int wxAuiNotebook::GetSelection() const // SetSelection() sets the currently active page size_t wxAuiNotebook::SetSelection(size_t new_page) { - // don't change the page unless necessary - if ((int)new_page == m_curpage) - return m_curpage; - wxWindow* wnd = m_tabs.GetWindowFromIdx(new_page); if (!wnd) return m_curpage; + // don't change the page unless necessary; + // however, clicking again on a tab should give it the focus. + if ((int)new_page == m_curpage) + { + wxAuiTabCtrl* ctrl; + int ctrl_idx; + if (FindTab(wnd, &ctrl, &ctrl_idx)) + { + if (FindFocus() != ctrl) + ctrl->SetFocus(); + } + return m_curpage; + } + wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId); evt.SetSelection(new_page); evt.SetOldSelection(m_curpage); @@ -2829,7 +3402,7 @@ size_t wxAuiNotebook::SetSelection(size_t new_page) DoSizing(); ctrl->DoShowHide(); - + ctrl->MakeTabVisible(ctrl_idx, ctrl); // set fonts wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); @@ -2842,12 +3415,15 @@ size_t wxAuiNotebook::SetSelection(size_t new_page) wxAuiTabCtrl* tabctrl = ((wxTabFrame*)pane.window)->m_tabs; if (tabctrl != ctrl) tabctrl->SetSelectedFont(m_normal_font); - else + else tabctrl->SetSelectedFont(m_selected_font); tabctrl->Refresh(); } - wnd->SetFocus(); + // Set the focus to the page if we're not currently focused on the tab. + // This is Firefox-like behaviour. + if (wnd->IsShownOnScreen() && FindFocus() != ctrl) + wnd->SetFocus(); return old_curpage; } @@ -2856,6 +3432,14 @@ size_t wxAuiNotebook::SetSelection(size_t new_page) return m_curpage; } +void wxAuiNotebook::SetSelectionToWindow(wxWindow *win) +{ + const int idx = m_tabs.GetIdxFromWindow(win); + wxCHECK_RET( idx != wxNOT_FOUND, _T("invalid notebook page") ); + + SetSelection(idx); +} + // GetPageCount() returns the total number of // pages managed by the multi-notebook size_t wxAuiNotebook::GetPageCount() const @@ -2923,7 +3507,7 @@ wxAuiTabCtrl* wxAuiNotebook::GetActiveTabCtrl() m_tab_id_counter++, wxDefaultPosition, wxDefaultSize, - wxNO_BORDER); + wxNO_BORDER|wxWANTS_CHARS); tabframe->m_tabs->SetFlags(m_flags); tabframe->m_tabs->SetArtProvider(m_tabs.GetArtProvider()->Clone()); m_mgr.AddPane(tabframe, @@ -2963,16 +3547,16 @@ bool wxAuiNotebook::FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx) void wxAuiNotebook::Split(size_t page, int direction) { wxSize cli_size = GetClientSize(); - + // get the page's window pointer wxWindow* wnd = GetPage(page); if (!wnd) return; - + // notebooks with 1 or less pages can't be split if (GetPageCount() < 2) return; - + // find out which tab control the page currently belongs to wxAuiTabCtrl *src_tabs, *dest_tabs; int src_idx = -1; @@ -2981,14 +3565,14 @@ void wxAuiNotebook::Split(size_t page, int direction) return; if (!src_tabs || src_idx == -1) return; - + // choose a split size wxSize split_size; if (GetPageCount() > 2) { split_size = CalculateNewSplitSize(); } - else + else { // because there are two panes, always split them // equally @@ -2996,8 +3580,8 @@ void wxAuiNotebook::Split(size_t page, int direction) split_size.x /= 2; split_size.y /= 2; } - - + + // create a new tab frame wxTabFrame* new_tabs = new wxTabFrame; new_tabs->m_rect = wxRect(wxPoint(0,0), split_size); @@ -3006,7 +3590,7 @@ void wxAuiNotebook::Split(size_t page, int direction) m_tab_id_counter++, wxDefaultPosition, wxDefaultSize, - wxNO_BORDER); + wxNO_BORDER|wxWANTS_CHARS); new_tabs->m_tabs->SetArtProvider(m_tabs.GetArtProvider()->Clone()); new_tabs->m_tabs->SetFlags(m_flags); dest_tabs = new_tabs->m_tabs; @@ -3015,31 +3599,31 @@ void wxAuiNotebook::Split(size_t page, int direction) // about where the pane should be added wxAuiPaneInfo pane_info = wxAuiPaneInfo().Bottom().CaptionVisible(false); wxPoint mouse_pt; - + if (direction == wxLEFT) { pane_info.Left(); mouse_pt = wxPoint(0, cli_size.y/2); } - else if (direction == wxRIGHT) + else if (direction == wxRIGHT) { pane_info.Right(); mouse_pt = wxPoint(cli_size.x, cli_size.y/2); } - else if (direction == wxTOP) + else if (direction == wxTOP) { pane_info.Top(); mouse_pt = wxPoint(cli_size.x/2, 0); } - else if (direction == wxBOTTOM) + else if (direction == wxBOTTOM) { pane_info.Bottom(); mouse_pt = wxPoint(cli_size.x/2, cli_size.y); } - + m_mgr.AddPane(new_tabs, pane_info, mouse_pt); m_mgr.Update(); - + // remove the page from the source tabs wxAuiNotebookPage page_info = src_tabs->GetPage(src_idx); page_info.active = false; @@ -3066,10 +3650,10 @@ void wxAuiNotebook::Split(size_t page, int direction) // force the set selection function reset the selection m_curpage = -1; - + // set the active page to the one we just split off - SetSelection(m_tabs.GetIdxFromWindow(page_info.window)); - + SetSelectionToPage(page_info); + UpdateHintWindowSize(); } @@ -3091,10 +3675,15 @@ void wxAuiNotebook::OnTabClicked(wxCommandEvent& command_evt) wxWindow* wnd = ctrl->GetWindowFromIdx(evt.GetSelection()); wxASSERT(wnd != NULL); - int idx = m_tabs.GetIdxFromWindow(wnd); - wxASSERT(idx != -1); + SetSelectionToWindow(wnd); +} - SetSelection(idx); +void wxAuiNotebook::OnTabBgDClick(wxCommandEvent& WXUNUSED(evt)) +{ + // notify owner that the tabbar background has been double-clicked + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, m_windowId); + e.SetEventObject(this); + GetEventHandler()->ProcessEvent(e); } void wxAuiNotebook::OnTabBeginDrag(wxCommandEvent&) @@ -3192,7 +3781,7 @@ void wxAuiNotebook::OnTabDragMotion(wxCommandEvent& evt) } } } - else + else { if (!dest_tabs) { @@ -3225,7 +3814,7 @@ void wxAuiNotebook::OnTabDragMotion(wxCommandEvent& evt) ClientToScreen(&hint_rect.x, &hint_rect.y); m_mgr.ShowHint(hint_rect); } - else + else { m_mgr.DrawHintRect(m_dummy_wnd, client_pt, zero); } @@ -3241,12 +3830,9 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt) wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject(); - wxAuiTabCtrl* dest_tabs = NULL; - if (src_tabs) - { - // set cursor back to an arrow - src_tabs->SetCursor(wxCursor(wxCURSOR_ARROW)); - } + wxCHECK_RET( src_tabs, _T("no source object?") ); + + src_tabs->SetCursor(wxCursor(wxCURSOR_ARROW)); // get the mouse position, which will be used to determine the drop point wxPoint mouse_screen_pt = ::wxGetMousePosition(); @@ -3294,11 +3880,24 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt) int src_idx = evt.GetSelection(); wxWindow* src_page = src_tabs->GetWindowFromIdx(src_idx); + // Check that it's not an impossible parent relationship + wxWindow* p = nb; + while (p && !p->IsTopLevel()) + { + if (p == src_page) + { + return; + } + p = p->GetParent(); + } + // get main index of the page int main_idx = m_tabs.GetIdxFromWindow(src_page); + wxCHECK_RET( main_idx != wxNOT_FOUND, _T("no source page?") ); + // make a copy of the page info - wxAuiNotebookPage page_info = m_tabs.GetPage((size_t)main_idx); + wxAuiNotebookPage page_info = m_tabs.GetPage(main_idx); // remove the page from the source notebook RemovePage(main_idx); @@ -3331,7 +3930,14 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt) dest_tabs->Refresh(); // set the selection in the destination tab control - nb->SetSelection(nb->m_tabs.GetIdxFromWindow(page_info.window)); + nb->SetSelectionToPage(page_info); + + // notify owner that the tab has been dragged + wxAuiNotebookEvent e2(wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, m_windowId); + e2.SetSelection(evt.GetSelection()); + e2.SetOldSelection(evt.GetSelection()); + e2.SetEventObject(this); + GetEventHandler()->ProcessEvent(e2); return; } @@ -3342,6 +3948,8 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt) // only perform a tab split if it's allowed + wxAuiTabCtrl* dest_tabs = NULL; + if ((m_flags & wxAUI_NB_TAB_SPLIT) && m_tabs.GetPageCount() >= 2) { // If the pointer is in an existing tab frame, do a tab insert @@ -3364,7 +3972,7 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt) insert_idx = dest_tabs->GetIdxFromWindow(target); } } - else + else { wxPoint zero(0,0); wxRect rect = m_mgr.CalculateHintRect(m_dummy_wnd, @@ -3384,7 +3992,7 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt) m_tab_id_counter++, wxDefaultPosition, wxDefaultSize, - wxNO_BORDER); + wxNO_BORDER|wxWANTS_CHARS); new_tabs->m_tabs->SetArtProvider(m_tabs.GetArtProvider()->Clone()); new_tabs->m_tabs->SetFlags(m_flags); @@ -3428,10 +4036,17 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt) m_curpage = -1; // set the active page to the one we just split off - SetSelection(m_tabs.GetIdxFromWindow(page_info.window)); + SetSelectionToPage(page_info); UpdateHintWindowSize(); } + + // notify owner that the tab has been dragged + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, m_windowId); + e.SetSelection(evt.GetSelection()); + e.SetOldSelection(evt.GetSelection()); + e.SetEventObject(this); + GetEventHandler()->ProcessEvent(e); } @@ -3496,7 +4111,8 @@ void wxAuiNotebook::RemoveEmptyTabFrames() // window closing, refreshs are pending if (!wxPendingDelete.Member(tab_frame->m_tabs)) wxPendingDelete.Append(tab_frame->m_tabs); - //tab_frame->m_tabs->Destroy(); + + tab_frame->m_tabs = NULL; delete tab_frame; } @@ -3524,11 +4140,33 @@ void wxAuiNotebook::RemoveEmptyTabFrames() m_mgr.GetPane(first_good).Centre(); } - m_mgr.Update(); + if (!m_isBeingDeleted) + m_mgr.Update(); } -void wxAuiNotebook::OnChildFocus(wxChildFocusEvent& evt) +void wxAuiNotebook::OnChildFocusNotebook(wxChildFocusEvent& evt) { + // if we're dragging a tab, don't change the current selection. + // This code prevents a bug that used to happen when the hint window + // was hidden. In the bug, the focus would return to the notebook + // child, which would then enter this handler and call + // SetSelection, which is not desired turn tab dragging. + + wxAuiPaneInfoArray& all_panes = m_mgr.GetAllPanes(); + size_t i, pane_count = all_panes.GetCount(); + for (i = 0; i < pane_count; ++i) + { + wxAuiPaneInfo& pane = all_panes.Item(i); + if (pane.name == wxT("dummy")) + continue; + wxTabFrame* tabframe = (wxTabFrame*)pane.window; + if (tabframe->m_tabs->IsDragging()) + return; + } + + + // change the tab selection to the child + // which was focused int idx = m_tabs.GetIdxFromWindow(evt.GetWindow()); if (idx != -1 && idx != m_curpage) { @@ -3536,6 +4174,80 @@ void wxAuiNotebook::OnChildFocus(wxChildFocusEvent& evt) } } +void wxAuiNotebook::OnNavigationKeyNotebook(wxNavigationKeyEvent& event) +{ + if ( event.IsWindowChange() ) { + // change pages + // FIXME: the problem with this is that if we have a split notebook, + // we selection may go all over the place. + AdvanceSelection(event.GetDirection()); + } + else { + // we get this event in 3 cases + // + // a) one of our pages might have generated it because the user TABbed + // out from it in which case we should propagate the event upwards and + // our parent will take care of setting the focus to prev/next sibling + // + // or + // + // b) the parent panel wants to give the focus to us so that we + // forward it to our selected page. We can't deal with this in + // OnSetFocus() because we don't know which direction the focus came + // from in this case and so can't choose between setting the focus to + // first or last panel child + // + // or + // + // c) we ourselves (see MSWTranslateMessage) generated the event + // + wxWindow * const parent = GetParent(); + + // the wxObject* casts are required to avoid MinGW GCC 2.95.3 ICE + const bool isFromParent = event.GetEventObject() == (wxObject*) parent; + const bool isFromSelf = event.GetEventObject() == (wxObject*) this; + + if ( isFromParent || isFromSelf ) + { + // no, it doesn't come from child, case (b) or (c): forward to a + // page but only if direction is backwards (TAB) or from ourselves, + if ( GetSelection() != wxNOT_FOUND && + (!event.GetDirection() || isFromSelf) ) + { + // so that the page knows that the event comes from it's parent + // and is being propagated downwards + event.SetEventObject(this); + + wxWindow *page = GetPage(GetSelection()); + if ( !page->GetEventHandler()->ProcessEvent(event) ) + { + page->SetFocus(); + } + //else: page manages focus inside it itself + } + else // otherwise set the focus to the notebook itself + { + SetFocus(); + } + } + else + { + // it comes from our child, case (a), pass to the parent, but only + // if the direction is forwards. Otherwise set the focus to the + // notebook itself. The notebook is always the 'first' control of a + // page. + if ( !event.GetDirection() ) + { + SetFocus(); + } + else if ( parent ) + { + event.SetCurrentFocus(this); + parent->GetEventHandler()->ProcessEvent(event); + } + } + } +} void wxAuiNotebook::OnTabButton(wxCommandEvent& command_evt) { @@ -3546,16 +4258,24 @@ void wxAuiNotebook::OnTabButton(wxCommandEvent& command_evt) if (button_id == wxAUI_BUTTON_CLOSE) { - int selection = tabs->GetActivePage(); + int selection = evt.GetSelection(); + + if (selection == -1) + { + // if the close button is to the right, use the active + // page selection to determine which page to close + selection = tabs->GetActivePage(); + } if (selection != -1) { wxWindow* close_wnd = tabs->GetWindowFromIdx(selection); - // ask owner if it's ok to close the tab wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE, m_windowId); e.SetSelection(m_tabs.GetIdxFromWindow(close_wnd)); + const int idx = m_tabs.GetIdxFromWindow(close_wnd); + e.SetSelection(idx); e.SetOldSelection(evt.GetSelection()); e.SetEventObject(this); GetEventHandler()->ProcessEvent(e); @@ -3563,20 +4283,192 @@ void wxAuiNotebook::OnTabButton(wxCommandEvent& command_evt) return; +#if wxUSE_MDI if (close_wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame))) { close_wnd->Close(); } - else + else +#endif { int main_idx = m_tabs.GetIdxFromWindow(close_wnd); + wxCHECK_RET( main_idx != wxNOT_FOUND, _T("no page to delete?") ); + DeletePage(main_idx); } + + // notify owner that the tab has been closed + wxAuiNotebookEvent e2(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, m_windowId); + e2.SetSelection(idx); + e2.SetEventObject(this); + GetEventHandler()->ProcessEvent(e2); } } } +void wxAuiNotebook::OnTabMiddleDown(wxCommandEvent& evt) +{ + // patch event through to owner + wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject(); + wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection()); + + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, m_windowId); + e.SetSelection(m_tabs.GetIdxFromWindow(wnd)); + e.SetEventObject(this); + GetEventHandler()->ProcessEvent(e); +} + +void wxAuiNotebook::OnTabMiddleUp(wxCommandEvent& evt) +{ + // if the wxAUI_NB_MIDDLE_CLICK_CLOSE is specified, middle + // click should act like a tab close action. However, first + // give the owner an opportunity to handle the middle up event + // for custom action + + wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject(); + wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection()); + + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, m_windowId); + e.SetSelection(m_tabs.GetIdxFromWindow(wnd)); + e.SetEventObject(this); + if (GetEventHandler()->ProcessEvent(e)) + return; + if (!e.IsAllowed()) + return; + + // check if we are supposed to close on middle-up + if ((m_flags & wxAUI_NB_MIDDLE_CLICK_CLOSE) == 0) + return; + + // simulate the user pressing the close button on the tab + evt.SetInt(wxAUI_BUTTON_CLOSE); + OnTabButton(evt); +} + +void wxAuiNotebook::OnTabRightDown(wxCommandEvent& evt) +{ + // patch event through to owner + wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject(); + wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection()); + + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, m_windowId); + e.SetSelection(m_tabs.GetIdxFromWindow(wnd)); + e.SetEventObject(this); + GetEventHandler()->ProcessEvent(e); +} + +void wxAuiNotebook::OnTabRightUp(wxCommandEvent& evt) +{ + // patch event through to owner + wxAuiTabCtrl* tabs = (wxAuiTabCtrl*)evt.GetEventObject(); + wxWindow* wnd = tabs->GetWindowFromIdx(evt.GetSelection()); + + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, m_windowId); + e.SetSelection(m_tabs.GetIdxFromWindow(wnd)); + e.SetEventObject(this); + GetEventHandler()->ProcessEvent(e); +} + +// Sets the normal font +void wxAuiNotebook::SetNormalFont(const wxFont& font) +{ + m_normal_font = font; + GetArtProvider()->SetNormalFont(font); +} + +// Sets the selected tab font +void wxAuiNotebook::SetSelectedFont(const wxFont& font) +{ + m_selected_font = font; + GetArtProvider()->SetSelectedFont(font); +} + +// Sets the measuring font +void wxAuiNotebook::SetMeasuringFont(const wxFont& font) +{ + GetArtProvider()->SetMeasuringFont(font); +} + +// Sets the tab font +bool wxAuiNotebook::SetFont(const wxFont& font) +{ + wxControl::SetFont(font); + + wxFont normalFont(font); + wxFont selectedFont(normalFont); + selectedFont.SetWeight(wxBOLD); + + SetNormalFont(normalFont); + SetSelectedFont(selectedFont); + SetMeasuringFont(selectedFont); + + return true; +} + +// Gets the tab control height +int wxAuiNotebook::GetTabCtrlHeight() const +{ + return m_tab_ctrl_height; +} + +// Gets the height of the notebook for a given page height +int wxAuiNotebook::GetHeightForPageHeight(int pageHeight) +{ + UpdateTabCtrlHeight(); + + int tabCtrlHeight = GetTabCtrlHeight(); + int decorHeight = 2; + return tabCtrlHeight + pageHeight + decorHeight; +} + +// Advances the selection, generation page selection events +void wxAuiNotebook::AdvanceSelection(bool forward) +{ + if (GetPageCount() <= 1) + return; + + int currentSelection = GetSelection(); + + if (forward) + { + if (currentSelection == (int) (GetPageCount() - 1)) + return; + else if (currentSelection == -1) + currentSelection = 0; + else + currentSelection ++; + } + else + { + if (currentSelection <= 0) + return; + else + currentSelection --; + } + + SetSelection(currentSelection); +} + +// Shows the window menu +bool wxAuiNotebook::ShowWindowMenu() +{ + wxAuiTabCtrl* tabCtrl = GetActiveTabCtrl(); + + int idx = tabCtrl->GetArtProvider()->ShowDropDown(tabCtrl, tabCtrl->GetPages(), tabCtrl->GetActivePage()); + + if (idx != -1) + { + wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, tabCtrl->GetId()); + e.SetSelection(idx); + e.SetOldSelection(tabCtrl->GetActivePage()); + e.SetEventObject(tabCtrl); + GetEventHandler()->ProcessEvent(e); + return true; + } + else + return false; +} #endif // wxUSE_AUI