#ifndef WX_PRECOMP
#include "wx/settings.h"
#include "wx/image.h"
+ #include "wx/menu.h"
#endif
#include "wx/aui/tabmdi.h"
#include "wx/dcbuffer.h"
-#include "wx/menu.h"
+
+#ifdef __WXMAC__
+#include "wx/mac/carbon/private.h"
+#endif
#include "wx/arrimpl.cpp"
WX_DEFINE_OBJARRAY(wxAuiNotebookPageArray)
-// This functions are here for this proof of concept
-// and will be factored out later. See dockart.cpp
-static wxColor StepColour(const wxColor& c, int percent)
-{
- int r = c.Red(), g = c.Green(), b = c.Blue();
- return wxColour((unsigned char)wxMin((r*percent)/100,255),
- (unsigned char)wxMin((g*percent)/100,255),
- (unsigned char)wxMin((b*percent)/100,255));
-}
+// these functions live in dockart.cpp -- they'll eventually
+// be moved to a new utility cpp file
-// This functions are here for this proof of concept
-// and will be factored out later. See dockart.cpp
-static wxBitmap BitmapFromBits(const unsigned char bits[], int w, int h,
- const wxColour& color)
-{
- wxImage img = wxBitmap((const char*)bits, w, h).ConvertToImage();
- img.Replace(0,0,0,123,123,123);
- img.Replace(255,255,255,color.Red(),color.Green(),color.Blue());
- img.SetMaskColour(123,123,123);
- return wxBitmap(img);
-}
+wxColor wxAuiStepColour(const wxColor& c, int percent);
+
+wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h,
+ const wxColour& color);
+
+wxString wxAuiChopText(wxDC& dc, const wxString& text, int max_size);
static void DrawButtons(wxDC& dc,
const wxRect& _rect,
if (button_state == wxAUI_BUTTON_STATE_HOVER ||
button_state == wxAUI_BUTTON_STATE_PRESSED)
{
- dc.SetBrush(wxBrush(StepColour(bkcolour, 120)));
- dc.SetPen(wxPen(StepColour(bkcolour, 70)));
+ dc.SetBrush(wxBrush(wxAuiStepColour(bkcolour, 120)));
+ dc.SetPen(wxPen(wxAuiStepColour(bkcolour, 75)));
// draw the background behind the button
dc.DrawRectangle(rect.x, rect.y, 15, 15);
}
}
-// chops the text so that it fits within |max_size| pixels.
-// Also adds an elipsis if necessary
-
-static wxString ChopText(wxDC& dc, const wxString& text, int max_size)
-{
- wxCoord x,y;
-
- // first check if the text fits with no problems
- dc.GetTextExtent(text, &x, &y);
- if (x <= max_size)
- return text;
-
- size_t i, len = text.Length();
- size_t last_good_length = 0;
- for (i = 0; i < len; ++i)
- {
- wxString s = text.Left(i);
- s += wxT("...");
-
- dc.GetTextExtent(s, &x, &y);
- if (x > max_size)
- break;
-
- last_good_length = i;
- }
-
- wxString ret = text.Left(last_good_length);
- ret += wxT("...");
- return ret;
-}
// -- GUI helper classes and functions --
class wxAuiCommandCapture : public wxEvtHandler
{
public:
-
+
wxAuiCommandCapture() { m_last_id = 0; }
int GetCommandId() const { return m_last_id; }
m_last_id = evt.GetId();
return true;
}
-
+
if (GetNextHandler())
return GetNextHandler()->ProcessEvent(evt);
return false;
}
-
+
private:
int m_last_id;
};
0xFF, 0xFF, 0xFF, 0xFF, 0x0F, 0xFE, 0x03, 0xF8, 0x01, 0xF0, 0x19, 0xF3,
0xB8, 0xE3, 0xF0, 0xE1, 0xE0, 0xE0, 0xF0, 0xE1, 0xB8, 0xE3, 0x19, 0xF3,
0x01, 0xF0, 0x03, 0xF8, 0x0F, 0xFE, 0xFF, 0xFF };
+#elif defined( __WXGTK__)
+ static unsigned char close_bits[]={
+ 0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8,
+ 0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef,
+ 0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
#else
static unsigned char close_bits[]={
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xf3, 0xcf, 0xf9,
m_selected_font = *wxNORMAL_FONT;
m_selected_font.SetWeight(wxBOLD);
m_measuring_font = m_selected_font;
-
+
m_fixed_tab_width = 100;
+ m_tab_ctrl_height = 0;
- wxColour base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+#ifdef __WXMAC__
+ wxBrush toolbarbrush;
+ toolbarbrush.MacSetTheme( kThemeBrushToolbarBackground );
+ wxColor base_colour = toolbarbrush.GetColour();
+#else
+ wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
+#endif
- wxColour background_colour = base_colour;
- wxColour normaltab_colour = base_colour;
- wxColour selectedtab_colour = base_colour;
+ // the base_colour is too pale to use as our base colour,
+ // so darken it a bit --
+ if ((255-base_colour.Red()) +
+ (255-base_colour.Green()) +
+ (255-base_colour.Blue()) < 60)
+ {
+ base_colour = wxAuiStepColour(base_colour, 92);
+ }
+
+ m_base_colour = base_colour;
+ wxColor border_colour = wxAuiStepColour(base_colour, 75);
+
+ m_border_pen = wxPen(border_colour);
+ m_base_colour_pen = wxPen(m_base_colour);
+ m_base_colour_brush = wxBrush(m_base_colour);
+
+ m_active_close_bmp = wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK);
+ m_disabled_close_bmp = wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128));
+
+ m_active_left_bmp = wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK);
+ m_disabled_left_bmp = wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128));
+
+ m_active_right_bmp = wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK);
+ m_disabled_right_bmp = wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128));
+
+ m_active_windowlist_bmp = wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK);
+ m_disabled_windowlist_bmp = wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128));
- m_bkbrush = wxBrush(background_colour);
- m_normal_bkbrush = wxBrush(normaltab_colour);
- m_normal_bkpen = wxPen(normaltab_colour);
- m_selected_bkbrush = wxBrush(selectedtab_colour);
- m_selected_bkpen = wxPen(selectedtab_colour);
-
-
- m_active_close_bmp = BitmapFromBits(close_bits, 16, 16, *wxBLACK);
- m_disabled_close_bmp = BitmapFromBits(close_bits, 16, 16, wxColour(128,128,128));
-
- m_active_left_bmp = BitmapFromBits(left_bits, 16, 16, *wxBLACK);
- m_disabled_left_bmp = BitmapFromBits(left_bits, 16, 16, wxColour(128,128,128));
-
- m_active_right_bmp = BitmapFromBits(right_bits, 16, 16, *wxBLACK);
- m_disabled_right_bmp = BitmapFromBits(right_bits, 16, 16, wxColour(128,128,128));
-
- m_active_windowlist_bmp = BitmapFromBits(list_bits, 16, 16, *wxBLACK);
- m_disabled_windowlist_bmp = BitmapFromBits(list_bits, 16, 16, wxColour(128,128,128));
-
m_flags = 0;
}
wxAuiTabArt* wxAuiDefaultTabArt::Clone()
{
- return static_cast<wxAuiTabArt*>(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)
size_t tab_count)
{
m_fixed_tab_width = 100;
-
- int tot_width = tab_ctrl_size.x;
+
+ int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4;
+
+ if (m_flags & wxAUI_NB_CLOSE_BUTTON)
+ tot_width -= m_active_close_bmp.GetWidth();
+ if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON)
+ tot_width -= m_active_windowlist_bmp.GetWidth();
+
if (tab_count > 0)
{
m_fixed_tab_width = tot_width/(int)tab_count;
}
-
-
+
+
if (m_fixed_tab_width < 100)
m_fixed_tab_width = 100;
-
+
if (m_fixed_tab_width > tot_width/2)
m_fixed_tab_width = tot_width/2;
-
+
if (m_fixed_tab_width > 220)
m_fixed_tab_width = 220;
+
+ m_tab_ctrl_height = tab_ctrl_size.y;
}
-
-
+
+
void wxAuiDefaultTabArt::DrawBackground(wxDC& dc,
wxWindow* WXUNUSED(wnd),
const wxRect& rect)
{
// draw background
- dc.SetBrush(m_bkbrush);
- dc.SetPen(*wxTRANSPARENT_PEN);
- dc.DrawRectangle(-1, -1, rect.GetWidth()+2, rect.GetHeight()+2);
+ 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);
+ dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH);
// draw base lines
- dc.SetPen(*wxGREY_PEN);
- dc.DrawLine(0, rect.GetHeight()-4, rect.GetWidth(), rect.GetHeight()-4);
- dc.DrawLine(0, rect.GetHeight()-1, rect.GetWidth(), rect.GetHeight()-1);
+ 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);
}
void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
wxWindow* wnd,
+ const wxAuiNotebookPage& page,
const wxRect& in_rect,
- const wxString& caption_text,
- bool active,
int close_button_state,
wxRect* out_tab_rect,
wxRect* out_button_rect,
wxCoord normal_textx, normal_texty;
wxCoord selected_textx, selected_texty;
wxCoord textx, texty;
-
+
// if the caption is empty, measure some temporary text
- wxString caption = caption_text;
- if (caption_text.empty())
+ wxString caption = page.caption;
+ if (caption.empty())
caption = wxT("Xj");
-
+
dc.SetFont(m_selected_font);
dc.GetTextExtent(caption, &selected_textx, &selected_texty);
-
+
dc.SetFont(m_normal_font);
dc.GetTextExtent(caption, &normal_textx, &normal_texty);
-
- // figure out the size of the tab
- wxSize tab_size = GetTabSize(dc, wnd, caption, active, close_button_state, x_extent);
- wxCoord tab_height = tab_size.y;
+ // figure out the size of the tab
+ wxSize tab_size = GetTabSize(dc,
+ wnd,
+ page.caption,
+ page.bitmap,
+ page.active,
+ close_button_state,
+ x_extent);
+
+ wxCoord tab_height = m_tab_ctrl_height - 3;
wxCoord tab_width = tab_size.x;
wxCoord tab_x = in_rect.x;
wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
- caption = caption_text;
-
- dc.SetClippingRegion(in_rect);
-
+ caption = page.caption;
// select pen, brush and font for the tab to be drawn
- if (active)
+ if (page.active)
{
- dc.SetPen(m_selected_bkpen);
- dc.SetBrush(m_selected_bkbrush);
dc.SetFont(m_selected_font);
textx = selected_textx;
texty = selected_texty;
}
else
{
- dc.SetPen(m_normal_bkpen);
- dc.SetBrush(m_normal_bkbrush);
dc.SetFont(m_normal_font);
textx = normal_textx;
texty = normal_texty;
}
-
+
// create points that will make the tab outline
-
- wxPoint points[6];
- points[0].x = tab_x;
- points[0].y = tab_y + tab_height - 4;
- points[1].x = tab_x;
- points[1].y = tab_y + 2;
- points[2].x = tab_x + 2;
- points[2].y = tab_y;
- points[3].x = tab_x + tab_width - 2;
- points[3].y = tab_y;
- points[4].x = tab_x + tab_width;
- points[4].y = tab_y + 2;
- points[5].x = tab_x + tab_width;
- points[5].y = tab_y + tab_height - 4;
+ int clip_width = tab_width;
+ if (tab_x + clip_width > in_rect.x + in_rect.width)
+ clip_width = (in_rect.x + in_rect.width) - tab_x;
+
+/*
+ wxPoint clip_points[6];
+ clip_points[0] = wxPoint(tab_x, tab_y+tab_height-3);
+ clip_points[1] = wxPoint(tab_x, tab_y+2);
+ clip_points[2] = wxPoint(tab_x+2, tab_y);
+ clip_points[3] = wxPoint(tab_x+clip_width-1, tab_y);
+ clip_points[4] = wxPoint(tab_x+clip_width+1, tab_y+2);
+ clip_points[5] = wxPoint(tab_x+clip_width+1, tab_y+tab_height-3);
+
+ // FIXME: these ports don't provide wxRegion ctor from array of points
+#if !defined(__WXDFB__) && !defined(__WXCOCOA__)
+ // set the clipping region for the tab --
+ wxRegion clipping_region(WXSIZEOF(clip_points), clip_points);
+ dc.SetClippingRegion(clipping_region);
+#endif // !wxDFB && !wxCocoa
+*/
+ // since the above code above doesn't play well with WXDFB or WXCOCOA,
+ // we'll just use a rectangle for the clipping region for now --
+ dc.SetClippingRegion(tab_x, tab_y, clip_width+1, tab_height-3);
+
+
+ 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);
+
+
+ int drawn_tab_yoff = border_points[1].y;
+ int drawn_tab_height = border_points[0].y - border_points[1].y;
+
+
+ if (page.active)
+ {
+ // draw active tab
+
+ // draw base background color
+ wxRect r(tab_x, tab_y, tab_width, tab_height);
+ dc.SetPen(m_base_colour_pen);
+ dc.SetBrush(m_base_colour_brush);
+ dc.DrawRectangle(r.x+1, r.y+1, r.width-1, r.height-4);
+
+ // this white helps fill out the gradient at the top of the tab
+ dc.SetPen(*wxWHITE_PEN);
+ dc.SetBrush(*wxWHITE_BRUSH);
+ dc.DrawRectangle(r.x+2, r.y+1, r.width-3, r.height-4);
+
+ // these two points help the rounded corners appear more antialiased
+ dc.SetPen(m_base_colour_pen);
+ dc.DrawPoint(r.x+2, r.y+1);
+ dc.DrawPoint(r.x+r.width-2, r.y+1);
+
+ // set rectangle down a bit for gradient drawing
+ r.SetHeight(r.GetHeight()/2);
+ r.x += 2;
+ r.width -= 2;
+ r.y += r.height;
+ r.y -= 2;
+
+ // draw gradient background
+ wxColor top_color = *wxWHITE;
+ wxColor bottom_color = m_base_colour;
+ dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
+ }
+ else
+ {
+ // draw inactive tab
- // draw gradient background
- if (active)
- {
- wxColour c = m_bkbrush.GetColour();
- dc.SetPen(wxPen(c));
-
- int y, last_y = -1;
- for (y = points[0].y; y > points[2].y; --y)
- {
- if (y < tab_y+(tab_height*3/5) && y != last_y)
- {
- last_y = y;
- c = StepColour(c, 102);
- dc.SetPen(wxPen(c));
- }
-
- dc.DrawLine(points[0].x+1, y, points[5].x, y);
- }
+ wxRect r(tab_x, tab_y+1, tab_width, tab_height-3);
+
+ // start the gradent up a bit and leave the inside border inset
+ // by a pixel for a 3D look. Only the top half of the inactive
+ // tab will have a slight gradient
+ r.x += 3;
+ r.y++;
+ r.width -= 4;
+ r.height /= 2;
+ r.height--;
+
+ // -- draw top gradient fill for glossy look
+ wxColor top_color = m_base_colour;
+ wxColor bottom_color = wxAuiStepColour(top_color, 160);
+ dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
+
+ r.y += r.height;
+ r.y--;
+
+ // -- draw bottom fill for glossy look
+ top_color = m_base_colour;
+ bottom_color = m_base_colour;
+ dc.GradientFillLinear(r, top_color, bottom_color, wxSOUTH);
}
- // draw tab outline
- dc.SetPen(*wxGREY_PEN);
+ // draw tab outline
+ dc.SetPen(m_border_pen);
dc.SetBrush(*wxTRANSPARENT_BRUSH);
- dc.DrawPolygon(6, points);
-
+ dc.DrawPolygon(WXSIZEOF(border_points), border_points);
+
// there are two horizontal grey lines at the bottom of the tab control,
// this gets rid of the top one of those lines in the tab control
- if (active)
+ if (page.active)
{
- wxColour c = m_bkbrush.GetColour();
- dc.SetPen(wxPen(c));
- dc.DrawLine(points[0].x, points[0].y, points[5].x+1, points[5].y);
+ wxColor start_color = m_base_colour;
+ dc.SetPen(m_base_colour_pen);
+ dc.DrawLine(border_points[0].x+1,
+ border_points[0].y,
+ border_points[5].x,
+ border_points[5].y);
}
-
- int text_offset;
+
+ int text_offset = tab_x + 8;
int close_button_width = 0;
-
if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
{
close_button_width = m_active_close_bmp.GetWidth();
}
-
- text_offset = tab_x + 8;
-
- wxString draw_text = ChopText(dc,
+
+ if (page.bitmap.IsOk())
+ {
+ int bitmap_offset = tab_x + 8;
+
+ // draw bitmap
+ dc.DrawBitmap(page.bitmap,
+ bitmap_offset,
+ drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2),
+ true);
+
+ text_offset = bitmap_offset + page.bitmap.GetWidth();
+ text_offset += 3; // bitmap padding
+ }
+ else
+ {
+ text_offset = tab_x + 8;
+ }
+
+
+ wxString draw_text = wxAuiChopText(dc,
caption,
tab_width - (text_offset-tab_x) - close_button_width);
-
+
// draw tab text
dc.DrawText(draw_text,
text_offset,
- (tab_y + tab_height)/2 - (texty/2));
+ drawn_tab_yoff + (drawn_tab_height)/2 - (texty/2) - 1);
{
bmp = m_active_close_bmp;
}
-
+
wxRect rect(tab_x + tab_width - close_button_width - 1,
tab_y + (tab_height/2) - (bmp.GetHeight()/2),
close_button_width,
tab_height);
IndentPressedBitmap(&rect, close_button_state);
dc.DrawBitmap(bmp, rect.x, rect.y, true);
-
+
*out_button_rect = rect;
}
-
+
*out_tab_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
-
+
dc.DestroyClippingRegion();
}
wxSize wxAuiDefaultTabArt::GetTabSize(wxDC& dc,
wxWindow* WXUNUSED(wnd),
const wxString& caption,
+ const wxBitmap& bitmap,
bool WXUNUSED(active),
int close_button_state,
int* x_extent)
{
wxCoord measured_textx, measured_texty, tmp;
-
+
dc.SetFont(m_measuring_font);
dc.GetTextExtent(caption, &measured_textx, &measured_texty);
-
+
dc.GetTextExtent(wxT("ABCDEFXj"), &tmp, &measured_texty);
-
+
// add padding around the text
- wxCoord tab_width = measured_textx + 16;
- wxCoord tab_height = measured_texty + 10;
+ wxCoord tab_width = measured_textx;
+ wxCoord tab_height = measured_texty;
+ // if the close button is showing, add space for it
if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
tab_width += m_active_close_bmp.GetWidth() + 3;
+ // if there's a bitmap, add space for it
+ if (bitmap.IsOk())
+ {
+ tab_width += bitmap.GetWidth();
+ tab_width += 3; // right side bitmap padding
+ tab_height = wxMax(tab_height, bitmap.GetHeight());
+ }
+
+ // add padding
+ tab_width += 16;
+ tab_height += 10;
if (m_flags & wxAUI_NB_TAB_FIXED_WIDTH)
{
tab_width = m_fixed_tab_width;
}
-
+
*x_extent = tab_width;
-
+
return wxSize(tab_width, tab_height);
}
int bitmap_id,
int button_state,
int orientation,
- const wxBitmap& bitmap_override,
wxRect* out_rect)
{
wxBitmap bmp;
wxRect rect;
-
- if (bitmap_override.IsOk())
- {
- bmp = bitmap_override;
- }
- else
+
+ switch (bitmap_id)
{
- switch (bitmap_id)
- {
- case wxAUI_BUTTON_CLOSE:
- if (button_state & wxAUI_BUTTON_STATE_DISABLED)
- bmp = m_disabled_close_bmp;
- else
- bmp = m_active_close_bmp;
- break;
- case wxAUI_BUTTON_LEFT:
- if (button_state & wxAUI_BUTTON_STATE_DISABLED)
- bmp = m_disabled_left_bmp;
- else
- bmp = m_active_left_bmp;
- break;
- case wxAUI_BUTTON_RIGHT:
- if (button_state & wxAUI_BUTTON_STATE_DISABLED)
- bmp = m_disabled_right_bmp;
- else
- bmp = m_active_right_bmp;
- break;
- case wxAUI_BUTTON_WINDOWLIST:
- if (button_state & wxAUI_BUTTON_STATE_DISABLED)
- bmp = m_disabled_windowlist_bmp;
- else
- bmp = m_active_windowlist_bmp;
- break;
- }
+ case wxAUI_BUTTON_CLOSE:
+ if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+ bmp = m_disabled_close_bmp;
+ else
+ bmp = m_active_close_bmp;
+ break;
+ case wxAUI_BUTTON_LEFT:
+ if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+ bmp = m_disabled_left_bmp;
+ else
+ bmp = m_active_left_bmp;
+ break;
+ case wxAUI_BUTTON_RIGHT:
+ if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+ bmp = m_disabled_right_bmp;
+ else
+ bmp = m_active_right_bmp;
+ break;
+ case wxAUI_BUTTON_WINDOWLIST:
+ if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+ bmp = m_disabled_windowlist_bmp;
+ else
+ bmp = m_active_windowlist_bmp;
+ break;
}
+
if (!bmp.IsOk())
return;
-
+
rect = in_rect;
-
+
if (orientation == wxLEFT)
{
rect.SetX(in_rect.x);
((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
bmp.GetWidth(), bmp.GetHeight());
}
-
+
IndentPressedBitmap(&rect, button_state);
dc.DrawBitmap(bmp, rect.x, rect.y, true);
-
+
*out_rect = rect;
}
-int wxAuiDefaultTabArt::ShowWindowList(wxWindow* wnd,
- const wxArrayString& items,
- int active_idx)
+int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd,
+ const wxAuiNotebookPageArray& pages,
+ int active_idx)
{
- wxMenu menuPopup;
+ wxMenu menuPopup;
- size_t i, count = items.GetCount();
+ size_t i, count = pages.GetCount();
for (i = 0; i < count; ++i)
{
- menuPopup.AppendCheckItem(1000+i, items.Item(i));
+ const wxAuiNotebookPage& page = pages.Item(i);
+ 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)
{
menuPopup.Check(1000+active_idx, true);
}
-
- // find out where to put the popup menu of window
- // items. Subtract 100 for now to center the menu
- // a bit, until a better mechanism can be implemented
+
+ // find out where to put the popup menu of window items
wxPoint pt = ::wxGetMousePosition();
pt = wnd->ScreenToClient(pt);
- if (pt.x < 100)
- pt.x = 0;
- else
- pt.x -= 100;
-
+
// find out the screen coordinate at the bottom of the tab ctrl
wxRect cli_rect = wnd->GetClientRect();
pt.y = cli_rect.y + cli_rect.height;
-
+
wxAuiCommandCapture* cc = new wxAuiCommandCapture;
wnd->PushEventHandler(cc);
wnd->PopupMenu(&menuPopup, pt);
int command = cc->GetCommandId();
wnd->PopEventHandler(true);
-
+
if (command >= 1000)
return command-1000;
-
+
return -1;
}
-int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd)
+int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd,
+ const wxAuiNotebookPageArray& pages,
+ const wxSize& required_bmp_size)
{
wxClientDC dc(wnd);
dc.SetFont(m_measuring_font);
- int x_ext = 0;
- wxSize s = GetTabSize(dc,
- wnd,
- wxT("ABCDEFGHIj"),
- true,
- wxAUI_BUTTON_STATE_HIDDEN,
- &x_ext);
- return s.y+3;
+
+ // sometimes a standard bitmap size needs to be enforced, especially
+ // if some tabs have bitmaps and others don't. This is important because
+ // it prevents the tab control from resizing when tabs are added.
+ wxBitmap measure_bmp;
+ if (required_bmp_size.IsFullySpecified())
+ {
+ measure_bmp.Create(required_bmp_size.x,
+ required_bmp_size.y);
+ }
+
+
+ int max_y = 0;
+ size_t i, page_count = pages.GetCount();
+ for (i = 0; i < page_count; ++i)
+ {
+ wxAuiNotebookPage& page = pages.Item(i);
+
+ wxBitmap bmp;
+ if (measure_bmp.IsOk())
+ bmp = measure_bmp;
+ else
+ bmp = page.bitmap;
+
+ // we don't use the caption text because we don't
+ // want tab heights to be different in the case
+ // of a very short piece of text on one tab and a very
+ // tall piece of text on another tab
+ int x_ext = 0;
+ wxSize s = GetTabSize(dc,
+ wnd,
+ wxT("ABCDEFGHIj"),
+ bmp,
+ true,
+ wxAUI_BUTTON_STATE_HIDDEN,
+ &x_ext);
+
+ max_y = wxMax(max_y, s.y);
+ }
+
+ return max_y+2;
}
void wxAuiDefaultTabArt::SetNormalFont(const wxFont& font)
wxColour base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
- wxColour background_colour = StepColour(base_colour, 95);
+ wxColour background_colour = base_colour;
wxColour normaltab_colour = base_colour;
wxColour selectedtab_colour = *wxWHITE;
m_normal_bkpen = wxPen(normaltab_colour);
m_selected_bkbrush = wxBrush(selectedtab_colour);
m_selected_bkpen = wxPen(selectedtab_colour);
-
- m_active_close_bmp = BitmapFromBits(close_bits, 16, 16, *wxBLACK);
- m_disabled_close_bmp = BitmapFromBits(close_bits, 16, 16, wxColour(128,128,128));
-
- m_active_left_bmp = BitmapFromBits(left_bits, 16, 16, *wxBLACK);
- m_disabled_left_bmp = BitmapFromBits(left_bits, 16, 16, wxColour(128,128,128));
-
- m_active_right_bmp = BitmapFromBits(right_bits, 16, 16, *wxBLACK);
- m_disabled_right_bmp = BitmapFromBits(right_bits, 16, 16, wxColour(128,128,128));
-
- m_active_windowlist_bmp = BitmapFromBits(list_bits, 16, 16, *wxBLACK);
- m_disabled_windowlist_bmp = BitmapFromBits(list_bits, 16, 16, wxColour(128,128,128));
-
+
+ m_active_close_bmp = wxAuiBitmapFromBits(close_bits, 16, 16, *wxBLACK);
+ m_disabled_close_bmp = wxAuiBitmapFromBits(close_bits, 16, 16, wxColour(128,128,128));
+
+ m_active_left_bmp = wxAuiBitmapFromBits(left_bits, 16, 16, *wxBLACK);
+ m_disabled_left_bmp = wxAuiBitmapFromBits(left_bits, 16, 16, wxColour(128,128,128));
+
+ m_active_right_bmp = wxAuiBitmapFromBits(right_bits, 16, 16, *wxBLACK);
+ m_disabled_right_bmp = wxAuiBitmapFromBits(right_bits, 16, 16, wxColour(128,128,128));
+
+ m_active_windowlist_bmp = wxAuiBitmapFromBits(list_bits, 16, 16, *wxBLACK);
+ m_disabled_windowlist_bmp = wxAuiBitmapFromBits(list_bits, 16, 16, wxColour(128,128,128));
+
}
wxAuiSimpleTabArt::~wxAuiSimpleTabArt()
size_t tab_count)
{
m_fixed_tab_width = 100;
-
- int tot_width = tab_ctrl_size.x;
+
+ int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4;
+
+ if (m_flags & wxAUI_NB_CLOSE_BUTTON)
+ tot_width -= m_active_close_bmp.GetWidth();
+ if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON)
+ tot_width -= m_active_windowlist_bmp.GetWidth();
+
if (tab_count > 0)
{
m_fixed_tab_width = tot_width/(int)tab_count;
}
-
-
+
+
if (m_fixed_tab_width < 100)
m_fixed_tab_width = 100;
-
+
if (m_fixed_tab_width > tot_width/2)
m_fixed_tab_width = tot_width/2;
-
+
if (m_fixed_tab_width > 220)
m_fixed_tab_width = 220;
}
void wxAuiSimpleTabArt::DrawTab(wxDC& dc,
wxWindow* wnd,
+ const wxAuiNotebookPage& page,
const wxRect& in_rect,
- const wxString& caption_text,
- bool active,
int close_button_state,
wxRect* out_tab_rect,
wxRect* out_button_rect,
wxCoord normal_textx, normal_texty;
wxCoord selected_textx, selected_texty;
wxCoord textx, texty;
-
+
// if the caption is empty, measure some temporary text
- wxString caption = caption_text;
- if (caption_text.empty())
+ wxString caption = page.caption;
+ if (caption.empty())
caption = wxT("Xj");
-
+
dc.SetFont(m_selected_font);
dc.GetTextExtent(caption, &selected_textx, &selected_texty);
-
+
dc.SetFont(m_normal_font);
dc.GetTextExtent(caption, &normal_textx, &normal_texty);
-
+
// figure out the size of the tab
- wxSize tab_size = GetTabSize(dc, wnd, caption, active, close_button_state, x_extent);
+ wxSize tab_size = GetTabSize(dc,
+ wnd,
+ page.caption,
+ page.bitmap,
+ page.active,
+ close_button_state,
+ x_extent);
wxCoord tab_height = tab_size.y;
wxCoord tab_width = tab_size.x;
wxCoord tab_x = in_rect.x;
wxCoord tab_y = in_rect.y + in_rect.height - tab_height;
- caption = caption_text;
+ caption = page.caption;
// select pen, brush and font for the tab to be drawn
- if (active)
+ if (page.active)
{
dc.SetPen(m_selected_bkpen);
dc.SetBrush(m_selected_bkbrush);
dc.SetClippingRegion(in_rect);
- dc.DrawPolygon(6, points);
+ dc.DrawPolygon(WXSIZEOF(points) - 1, points);
dc.SetPen(*wxGREY_PEN);
- //dc.DrawLines(active ? 6 : 7, points);
- dc.DrawLines(7, points);
+ //dc.DrawLines(active ? WXSIZEOF(points) - 1 : WXSIZEOF(points), points);
+ dc.DrawLines(WXSIZEOF(points), points);
int text_offset;
{
text_offset = tab_x + (tab_height/3) + (tab_width/2) - (textx/2);
}
-
+
// set minimum text offset
if (text_offset < tab_x + tab_height)
text_offset = tab_x + tab_height;
// chop text if necessary
- wxString draw_text = ChopText(dc,
+ wxString draw_text = wxAuiChopText(dc,
caption,
tab_width - (text_offset-tab_x) - close_button_width);
if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
{
wxBitmap bmp;
- if (active)
+ if (page.active)
bmp = m_active_close_bmp;
else
bmp = m_disabled_close_bmp;
-
+
wxRect rect(tab_x + tab_width - close_button_width - 1,
tab_y + (tab_height/2) - (bmp.GetHeight()/2) + 1,
close_button_width,
tab_height - 1);
DrawButtons(dc, rect, bmp, *wxWHITE, close_button_state);
-
+
*out_button_rect = rect;
}
*out_tab_rect = wxRect(tab_x, tab_y, tab_width, tab_height);
-
+
dc.DestroyClippingRegion();
}
wxSize wxAuiSimpleTabArt::GetTabSize(wxDC& dc,
wxWindow* WXUNUSED(wnd),
const wxString& caption,
+ const wxBitmap& WXUNUSED(bitmap),
bool WXUNUSED(active),
int close_button_state,
int* x_extent)
{
wxCoord measured_textx, measured_texty;
-
+
dc.SetFont(m_measuring_font);
dc.GetTextExtent(caption, &measured_textx, &measured_texty);
-
+
wxCoord tab_height = measured_texty + 4;
wxCoord tab_width = measured_textx + tab_height + 5;
if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN)
tab_width += m_active_close_bmp.GetWidth();
-
+
if (m_flags & wxAUI_NB_TAB_FIXED_WIDTH)
{
tab_width = m_fixed_tab_width;
}
-
+
*x_extent = tab_width - (tab_height/2) - 1;
return wxSize(tab_width, tab_height);
int bitmap_id,
int button_state,
int orientation,
- const wxBitmap& bitmap_override,
wxRect* out_rect)
{
wxBitmap bmp;
wxRect rect;
-
- if (bitmap_override.IsOk())
- {
- bmp = bitmap_override;
- }
- else
+
+ switch (bitmap_id)
{
- switch (bitmap_id)
- {
- case wxAUI_BUTTON_CLOSE:
- if (button_state & wxAUI_BUTTON_STATE_DISABLED)
- bmp = m_disabled_close_bmp;
- else
- bmp = m_active_close_bmp;
- break;
- case wxAUI_BUTTON_LEFT:
- if (button_state & wxAUI_BUTTON_STATE_DISABLED)
- bmp = m_disabled_left_bmp;
- else
- bmp = m_active_left_bmp;
- break;
- case wxAUI_BUTTON_RIGHT:
- if (button_state & wxAUI_BUTTON_STATE_DISABLED)
- bmp = m_disabled_right_bmp;
- else
- bmp = m_active_right_bmp;
- break;
- case wxAUI_BUTTON_WINDOWLIST:
- if (button_state & wxAUI_BUTTON_STATE_DISABLED)
- bmp = m_disabled_windowlist_bmp;
- else
- bmp = m_active_windowlist_bmp;
- break;
- }
+ case wxAUI_BUTTON_CLOSE:
+ if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+ bmp = m_disabled_close_bmp;
+ else
+ bmp = m_active_close_bmp;
+ break;
+ case wxAUI_BUTTON_LEFT:
+ if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+ bmp = m_disabled_left_bmp;
+ else
+ bmp = m_active_left_bmp;
+ break;
+ case wxAUI_BUTTON_RIGHT:
+ if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+ bmp = m_disabled_right_bmp;
+ else
+ bmp = m_active_right_bmp;
+ break;
+ case wxAUI_BUTTON_WINDOWLIST:
+ if (button_state & wxAUI_BUTTON_STATE_DISABLED)
+ bmp = m_disabled_windowlist_bmp;
+ else
+ bmp = m_active_windowlist_bmp;
+ break;
}
if (!bmp.IsOk())
return;
-
+
rect = in_rect;
-
+
if (orientation == wxLEFT)
{
rect.SetX(in_rect.x);
((in_rect.y + in_rect.height)/2) - (bmp.GetHeight()/2),
bmp.GetWidth(), bmp.GetHeight());
}
-
-
+
+
DrawButtons(dc, rect, bmp, *wxWHITE, button_state);
-
+
*out_rect = rect;
}
-int wxAuiSimpleTabArt::ShowWindowList(wxWindow* wnd,
- const wxArrayString& items,
- int active_idx)
+int wxAuiSimpleTabArt::ShowDropDown(wxWindow* wnd,
+ const wxAuiNotebookPageArray& pages,
+ int active_idx)
{
- wxMenu menuPopup;
+ wxMenu menuPopup;
- size_t i, count = items.GetCount();
+ size_t i, count = pages.GetCount();
for (i = 0; i < count; ++i)
{
- menuPopup.AppendCheckItem(1000+i, items.Item(i));
+ const wxAuiNotebookPage& page = pages.Item(i);
+ menuPopup.AppendCheckItem(1000+i, page.caption);
}
-
+
if (active_idx != -1)
{
menuPopup.Check(1000+active_idx, true);
}
-
+
// find out where to put the popup menu of window
// items. Subtract 100 for now to center the menu
// a bit, until a better mechanism can be implemented
pt.x = 0;
else
pt.x -= 100;
-
+
// find out the screen coordinate at the bottom of the tab ctrl
wxRect cli_rect = wnd->GetClientRect();
pt.y = cli_rect.y + cli_rect.height;
-
+
wxAuiCommandCapture* cc = new wxAuiCommandCapture;
wnd->PushEventHandler(cc);
wnd->PopupMenu(&menuPopup, pt);
int command = cc->GetCommandId();
wnd->PopEventHandler(true);
-
+
if (command >= 1000)
return command-1000;
-
+
return -1;
}
-int wxAuiSimpleTabArt::GetBestTabCtrlSize(wxWindow* wnd)
+int wxAuiSimpleTabArt::GetBestTabCtrlSize(wxWindow* wnd,
+ const wxAuiNotebookPageArray& WXUNUSED(pages),
+ const wxSize& WXUNUSED(required_bmp_size))
{
wxClientDC dc(wnd);
dc.SetFont(m_measuring_font);
wxSize s = GetTabSize(dc,
wnd,
wxT("ABCDEFGHIj"),
+ wxNullBitmap,
true,
wxAUI_BUTTON_STATE_HIDDEN,
&x_ext);
m_tab_offset = 0;
m_flags = 0;
m_art = new wxAuiDefaultTabArt;
-
- AddButton(wxAUI_BUTTON_LEFT, wxLEFT);
+
+ AddButton(wxAUI_BUTTON_LEFT, wxLEFT);
AddButton(wxAUI_BUTTON_RIGHT, wxRIGHT);
AddButton(wxAUI_BUTTON_WINDOWLIST, wxRIGHT);
AddButton(wxAUI_BUTTON_CLOSE, wxRIGHT);
{
delete m_art;
m_art = art;
-
+
if (m_art)
{
m_art->SetFlags(m_flags);
}
}
-wxAuiTabArt* wxAuiTabContainer::GetArtProvider()
+wxAuiTabArt* wxAuiTabContainer::GetArtProvider() const
{
return m_art;
}
void wxAuiTabContainer::SetFlags(unsigned int flags)
{
m_flags = flags;
-
+
// check for new close button settings
- RemoveButton(wxAUI_BUTTON_LEFT);
+ RemoveButton(wxAUI_BUTTON_LEFT);
RemoveButton(wxAUI_BUTTON_RIGHT);
RemoveButton(wxAUI_BUTTON_WINDOWLIST);
RemoveButton(wxAUI_BUTTON_CLOSE);
-
-
+
+
if (flags & wxAUI_NB_SCROLL_BUTTONS)
{
- AddButton(wxAUI_BUTTON_LEFT, wxLEFT);
+ AddButton(wxAUI_BUTTON_LEFT, wxLEFT);
AddButton(wxAUI_BUTTON_RIGHT, wxRIGHT);
}
{
AddButton(wxAUI_BUTTON_WINDOWLIST, wxRIGHT);
}
-
+
if (flags & wxAUI_NB_CLOSE_BUTTON)
{
AddButton(wxAUI_BUTTON_CLOSE, wxRIGHT);
}
-
+
if (m_art)
{
m_art->SetFlags(m_flags);
void wxAuiTabContainer::SetRect(const wxRect& rect)
{
m_rect = rect;
-
+
if (m_art)
{
m_art->SetSizingInfo(rect.GetSize(), m_pages.GetCount());
{
m_art->SetSizingInfo(m_rect.GetSize(), m_pages.GetCount());
}
-
+
return true;
}
{
m_art->SetSizingInfo(m_rect.GetSize(), m_pages.GetCount());
}
-
+
return true;
}
int idx = GetIdxFromWindow(page);
if (idx == -1)
return false;
-
+
// get page entry, make a copy of it
wxAuiNotebookPage p = GetPage(idx);
-
+
// remove old page entry
RemovePage(page);
-
+
// insert page where it should be
InsertPage(page, p, new_idx);
-
+
return true;
}
if (page.window == wnd)
{
m_pages.RemoveAt(i);
-
+
// let the art provider know how many pages we have
if (m_art)
{
m_art->SetSizingInfo(m_rect.GetSize(), m_pages.GetCount());
}
-
+
return true;
}
}
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)
return m_pages[idx];
}
+const wxAuiNotebookPage& wxAuiTabContainer::GetPage(size_t idx) const
+{
+ wxASSERT_MSG(idx < m_pages.GetCount(), wxT("Invalid Page index"));
+
+ return m_pages[idx];
+}
+
wxAuiNotebookPageArray& wxAuiTabContainer::GetPages()
{
return m_pages;
// provide custom drawing capabilities
void wxAuiTabContainer::Render(wxDC* raw_dc, wxWindow* wnd)
{
+ if (!raw_dc || !raw_dc->IsOk())
+ return;
+
wxMemoryDC dc;
wxBitmap bmp;
size_t i;
bmp.Create(m_rect.GetWidth(), m_rect.GetHeight());
dc.SelectObject(bmp);
+ if (!dc.IsOk())
+ return;
// find out if size of tabs is larger than can be
// afforded on screen
for (i = 0; i < page_count; ++i)
{
wxAuiNotebookPage& page = m_pages.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 ||
{
close_button = true;
}
-
-
+
+
int x_extent = 0;
wxSize size = m_art->GetTabSize(dc,
wnd,
page.caption,
+ page.bitmap,
page.active,
close_button ?
wxAUI_BUTTON_STATE_NORMAL :
wxAUI_BUTTON_STATE_HIDDEN,
&x_extent);
-
+
if (i+1 < page_count)
total_width += x_extent;
else
total_width += size.x;
-
+
if (i >= m_tab_offset)
{
if (i+1 < page_count)
visible_width += size.x;
}
}
-
+
if (total_width > m_rect.GetWidth() || m_tab_offset != 0)
{
// show left/right buttons
// draw buttons
int left_buttons_width = 0;
int right_buttons_width = 0;
-
+
int offset = 0;
// draw the buttons on the right side
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;
-
+
wxRect button_rect = m_rect;
button_rect.SetY(1);
button_rect.SetWidth(offset);
button.id,
button.cur_state,
wxRIGHT,
- wxNullBitmap,
&button.rect);
offset -= button.rect.GetWidth();
offset = 0;
-
+
// draw 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;
-
+
wxRect button_rect(offset, 1, 1000, m_rect.height);
m_art->DrawButton(dc,
button.id,
button.cur_state,
wxLEFT,
- wxNullBitmap,
&button.rect);
-
+
offset += button.rect.GetWidth();
left_buttons_width += button.rect.GetWidth();
}
offset = left_buttons_width;
-
+
if (offset == 0)
- offset += m_art->GetIndentSize();
-
+ offset += m_art->GetIndentSize();
+
+
// prepare the tab-close-button array
+ // make sure tab button entries which aren't used are marked as hidden
+ for (i = page_count; i < m_tab_close_buttons.GetCount(); ++i)
+ m_tab_close_buttons.Item(i).cur_state = wxAUI_BUTTON_STATE_HIDDEN;
+
+ // make sure there are enough tab button entries to accommodate all tabs
while (m_tab_close_buttons.GetCount() < page_count)
{
wxAuiTabContainerButton tempbtn;
tempbtn.cur_state = wxAUI_BUTTON_STATE_HIDDEN;
m_tab_close_buttons.Add(tempbtn);
}
-
+
+
+ // buttons before the tab offset must be set to hidden
for (i = 0; i < m_tab_offset; ++i)
{
- // buttons before the tab offset must be set to hidden
m_tab_close_buttons.Item(i).cur_state = wxAUI_BUTTON_STATE_HIDDEN;
}
-
-
+
+
// draw the tabs
size_t active = 999;
if (rect.width <= 0)
break;
-
-
-
m_art->DrawTab(dc,
wnd,
+ page,
rect,
- page.caption,
- page.active,
tab_button.cur_state,
&page.rect,
&tab_button.rect,
active_offset = offset;
active_rect = rect;
}
-
+
offset += x_extent;
}
+
+ // make sure to deactivate buttons which are off the screen to the right
+ for (++i; i < m_tab_close_buttons.GetCount(); ++i)
+ {
+ m_tab_close_buttons.Item(i).cur_state = wxAUI_BUTTON_STATE_HIDDEN;
+ }
+
+
// draw the active tab again so it stands in the foreground
if (active >= m_tab_offset && active < m_pages.GetCount())
{
rect.x = active_offset;
m_art->DrawTab(dc,
wnd,
+ page,
active_rect,
- page.caption,
- page.active,
tab_button.cur_state,
&page.rect,
&tab_button.rect,
&x_extent);
}
-
+
raw_dc->Blit(m_rect.x, m_rect.y,
m_rect.GetWidth(), m_rect.GetHeight(),
&dc, 0, 0);
{
if (!m_rect.Contains(x,y))
return false;
-
+
wxAuiTabContainerButton* btn = NULL;
if (ButtonHitTest(x, y, &btn))
{
return false;
size_t i, button_count;
-
-
+
+
button_count = m_buttons.GetCount();
for (i = 0; i < button_count; ++i)
{
wxAuiTabContainerButton& button = m_buttons.Item(i);
- if (button.rect.Contains(x,y))
+ if (button.rect.Contains(x,y) &&
+ !(button.cur_state & (wxAUI_BUTTON_STATE_HIDDEN |
+ wxAUI_BUTTON_STATE_DISABLED)))
{
if (hit)
*hit = &button;
return true;
}
}
-
+
button_count = m_tab_close_buttons.GetCount();
for (i = 0; i < button_count; ++i)
{
wxAuiTabContainerButton& button = m_tab_close_buttons.Item(i);
- if (button.rect.Contains(x,y))
+ if (button.rect.Contains(x,y) &&
+ !(button.cur_state & (wxAUI_BUTTON_STATE_HIDDEN |
+ wxAUI_BUTTON_STATE_DISABLED)))
{
if (hit)
*hit = &button;
return true;
}
}
-
+
return false;
}
for (i = 0; i < page_count; ++i)
{
wxAuiNotebookPage& page = pages.Item(i);
- ShowWnd(page.window, page.active);
+ if (!page.active)
+ ShowWnd(page.window, false);
}
}
EVT_ERASE_BACKGROUND(wxAuiTabCtrl::OnEraseBackground)
EVT_SIZE(wxAuiTabCtrl::OnSize)
EVT_LEFT_DOWN(wxAuiTabCtrl::OnLeftDown)
+ EVT_LEFT_DCLICK(wxAuiTabCtrl::OnLeftDown)
EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp)
EVT_MOTION(wxAuiTabCtrl::OnMotion)
EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow)
- EVT_AUINOTEBOOK_BUTTON(-1, wxAuiTabCtrl::OnButton)
+ EVT_AUINOTEBOOK_BUTTON(wxID_ANY, wxAuiTabCtrl::OnButton)
END_EVENT_TABLE()
m_click_pt = wxDefaultPosition;
m_is_dragging = false;
m_hover_button = NULL;
+ m_pressed_button = NULL;
}
wxAuiTabCtrl::~wxAuiTabCtrl()
m_click_pt = wxDefaultPosition;
m_is_dragging = false;
m_click_tab = NULL;
+ m_pressed_button = NULL;
+
wxWindow* wnd;
if (TabHitTest(evt.m_x, evt.m_y, &wnd))
{
- wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
- e.SetSelection(GetIdxFromWindow(wnd));
- e.SetOldSelection(GetActivePage());
- e.SetEventObject(this);
- GetEventHandler()->ProcessEvent(e);
+ int new_selection = GetIdxFromWindow(wnd);
+
+ // wxAuiNotebooks always want to receive this event
+ // even if the tab is already active, because they may
+ // have multiple tab controls
+ if (new_selection != GetActivePage() ||
+ GetParent()->IsKindOf(CLASSINFO(wxAuiNotebook)))
+ {
+ wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
+ e.SetSelection(new_selection);
+ e.SetOldSelection(GetActivePage());
+ e.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(e);
+ }
m_click_pt.x = evt.m_x;
m_click_pt.y = evt.m_y;
if (m_hover_button)
{
- m_hover_button->cur_state = wxAUI_BUTTON_STATE_PRESSED;
+ m_pressed_button = m_hover_button;
+ m_pressed_button->cur_state = wxAUI_BUTTON_STATE_PRESSED;
Refresh();
Update();
}
}
-void wxAuiTabCtrl::OnLeftUp(wxMouseEvent&)
+void wxAuiTabCtrl::OnLeftUp(wxMouseEvent& evt)
{
if (GetCapture() == this)
ReleaseMouse();
return;
}
- if (m_hover_button)
+ if (m_pressed_button)
{
- m_hover_button->cur_state = wxAUI_BUTTON_STATE_HOVER;
+ // make sure we're still clicking the button
+ wxAuiTabContainerButton* button = NULL;
+ if (!ButtonHitTest(evt.m_x, evt.m_y, &button))
+ return;
+
+ if (button != m_pressed_button)
+ {
+ m_pressed_button = NULL;
+ return;
+ }
+
Refresh();
Update();
- if (!(m_hover_button->cur_state & wxAUI_BUTTON_STATE_DISABLED))
+ if (!(m_pressed_button->cur_state & wxAUI_BUTTON_STATE_DISABLED))
{
wxAuiNotebookEvent evt(wxEVT_COMMAND_AUINOTEBOOK_BUTTON, m_windowId);
- evt.SetInt(m_hover_button->id);
+ evt.SetInt(m_pressed_button->id);
evt.SetEventObject(this);
GetEventHandler()->ProcessEvent(evt);
}
+
+ m_pressed_button = NULL;
}
m_click_pt = wxDefaultPosition;
Refresh();
Update();
}
-
+
if (button->cur_state != wxAUI_BUTTON_STATE_HOVER)
{
button->cur_state = wxAUI_BUTTON_STATE_HOVER;
void wxAuiTabCtrl::OnButton(wxAuiNotebookEvent& event)
{
int button = event.GetInt();
-
+
if (button == wxAUI_BUTTON_LEFT || button == wxAUI_BUTTON_RIGHT)
{
if (button == wxAUI_BUTTON_LEFT)
}
else if (button == wxAUI_BUTTON_WINDOWLIST)
{
- wxArrayString as;
-
- size_t i, page_count = m_pages.GetCount();
- for (i = 0; i < page_count; ++i)
- {
- wxAuiNotebookPage& page = m_pages.Item(i);
- as.Add(page.caption);
- }
+ int idx = GetArtProvider()->ShowDropDown(this, m_pages, GetActivePage());
- int idx = GetArtProvider()->ShowWindowList(this, as, GetActivePage());
-
if (idx != -1)
{
wxAuiNotebookEvent e(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING, m_windowId);
m_tab_ctrl_height = 20;
}
+ ~wxTabFrame()
+ {
+ wxDELETE(m_tabs);
+ }
+
void SetTabCtrlHeight(int h)
{
m_tab_ctrl_height = h;
};
-
+const int wxAuiBaseTabCtrlId = 5380;
// -- wxAuiNotebook class implementation --
BEGIN_EVENT_TABLE(wxAuiNotebook, wxControl)
- //EVT_ERASE_BACKGROUND(wxAuiNotebook::OnEraseBackground)
- //EVT_SIZE(wxAuiNotebook::OnSize)
- //EVT_LEFT_DOWN(wxAuiNotebook::OnLeftDown)
+ EVT_SIZE(wxAuiNotebook::OnSize)
EVT_CHILD_FOCUS(wxAuiNotebook::OnChildFocus)
- EVT_COMMAND_RANGE(10000, 10100,
+ EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING,
wxAuiNotebook::OnTabClicked)
- EVT_COMMAND_RANGE(10000, 10100,
+ EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG,
wxAuiNotebook::OnTabBeginDrag)
- EVT_COMMAND_RANGE(10000, 10100,
+ EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
wxEVT_COMMAND_AUINOTEBOOK_END_DRAG,
wxAuiNotebook::OnTabEndDrag)
- EVT_COMMAND_RANGE(10000, 10100,
+ EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION,
wxAuiNotebook::OnTabDragMotion)
- EVT_COMMAND_RANGE(10000, 10100,
+ EVT_COMMAND_RANGE(wxAuiBaseTabCtrlId, wxAuiBaseTabCtrlId+500,
wxEVT_COMMAND_AUINOTEBOOK_BUTTON,
wxAuiNotebook::OnTabButton)
END_EVENT_TABLE()
wxAuiNotebook::wxAuiNotebook()
{
m_curpage = -1;
- m_tab_id_counter = 10000;
+ m_tab_id_counter = wxAuiBaseTabCtrlId;
m_dummy_wnd = NULL;
m_tab_ctrl_height = 20;
+ m_requested_bmp_size = wxDefaultSize;
+ m_requested_tabctrl_height = -1;
}
wxAuiNotebook::wxAuiNotebook(wxWindow *parent,
const wxSize& size,
long style) : wxControl(parent, id, pos, size, style)
{
+ m_dummy_wnd = NULL;
+ m_requested_bmp_size = wxDefaultSize;
+ m_requested_tabctrl_height = -1;
InitNotebook(style);
}
void wxAuiNotebook::InitNotebook(long style)
{
m_curpage = -1;
- m_tab_id_counter = 10000;
+ m_tab_id_counter = wxAuiBaseTabCtrlId;
m_dummy_wnd = NULL;
- m_tab_ctrl_height = 20;
m_flags = (unsigned int)style;
-
+ m_tab_ctrl_height = 20;
+
m_normal_font = *wxNORMAL_FONT;
m_selected_font = *wxNORMAL_FONT;
m_selected_font.SetWeight(wxBOLD);
m_dummy_wnd->Show(false);
m_mgr.SetManagedWindow(this);
+ m_mgr.SetFlags(wxAUI_MGR_DEFAULT);
+ m_mgr.SetDockSizeConstraint(1.0, 1.0); // no dock size constraint
m_mgr.AddPane(m_dummy_wnd,
- wxAuiPaneInfo().Name(wxT("dummy")).Bottom().Show(false));
+ wxAuiPaneInfo().Name(wxT("dummy")).Bottom().CaptionVisible(false).Show(false));
m_mgr.Update();
}
void wxAuiNotebook::SetArtProvider(wxAuiTabArt* art)
{
m_tabs.SetArtProvider(art);
-
- // choose a default for the tab height
- m_tab_ctrl_height = art->GetBestTabCtrlSize(this);
-
+
+ UpdateTabCtrlHeight();
+}
+
+// SetTabCtrlHeight() is the highest-level override of the
+// tab height. A call to this function effectively enforces a
+// specified tab ctrl height, overriding all other considerations,
+// such as text or bitmap height. It overrides any call to
+// SetUniformBitmapSize(). Specifying a height of -1 reverts
+// any previous call and returns to the default behavior
+
+void wxAuiNotebook::SetTabCtrlHeight(int height)
+{
+ m_requested_tabctrl_height = height;
+
+ // if window is already initialized, recalculate the tab height
+ if (m_dummy_wnd)
+ {
+ UpdateTabCtrlHeight();
+ }
+}
+
+
+// SetUniformBitmapSize() ensures that all tabs will have
+// the same height, even if some tabs don't have bitmaps
+// Passing wxDefaultSize to this function will instruct
+// the control to use dynamic tab height-- so when a tab
+// with a large bitmap is added, the tab ctrl's height will
+// automatically increase to accommodate the bitmap
+
+void wxAuiNotebook::SetUniformBitmapSize(const wxSize& size)
+{
+ m_requested_bmp_size = size;
+
+ // if window is already initialized, recalculate the tab height
+ if (m_dummy_wnd)
+ {
+ UpdateTabCtrlHeight();
+ }
+}
+
+// UpdateTabCtrlHeight() does the actual tab resizing. It's meant
+// to be used interally
+void wxAuiNotebook::UpdateTabCtrlHeight()
+{
+ // get the tab ctrl height we will use
+ int height = CalculateTabCtrlHeight();
+
+ // if the tab control height needs to change, update
+ // all of our tab controls with the new height
+ if (m_tab_ctrl_height != height)
+ {
+ wxAuiTabArt* art = m_tabs.GetArtProvider();
+
+ m_tab_ctrl_height = height;
+
+ 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* tab_frame = (wxTabFrame*)pane.window;
+ wxAuiTabCtrl* tabctrl = tab_frame->m_tabs;
+ tab_frame->SetTabCtrlHeight(m_tab_ctrl_height);
+ tabctrl->SetArtProvider(art->Clone());
+ tab_frame->DoSizing();
+ }
+ }
+}
+
+void wxAuiNotebook::UpdateHintWindowSize()
+{
+ wxSize size = CalculateNewSplitSize();
+
+ // the placeholder hint window should be set to this size
+ wxAuiPaneInfo& info = m_mgr.GetPane(wxT("dummy"));
+ if (info.IsOk())
+ {
+ info.MinSize(size);
+ info.BestSize(size);
+ m_dummy_wnd->SetSize(size);
+ }
+}
+
+
+// calculates the size of the new split
+wxSize wxAuiNotebook::CalculateNewSplitSize()
+{
+ // count number of tab controls
+ int tab_ctrl_count = 0;
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* tab_frame = (wxTabFrame*)pane.window;
- wxAuiTabCtrl* tabctrl = tab_frame->m_tabs;
- tab_frame->SetTabCtrlHeight(m_tab_ctrl_height);
- tabctrl->SetArtProvider(art->Clone());
- tab_frame->DoSizing();
+ tab_ctrl_count++;
+ }
+
+ wxSize new_split_size;
+
+ // if there is only one tab control, the first split
+ // should happen around the middle
+ if (tab_ctrl_count < 2)
+ {
+ new_split_size = GetClientSize();
+ new_split_size.x /= 2;
+ new_split_size.y /= 2;
+ }
+ else
+ {
+ // this is in place of a more complicated calculation
+ // that needs to be implemented
+ new_split_size = wxSize(180,180);
}
-
+
+ return new_split_size;
+}
+
+int wxAuiNotebook::CalculateTabCtrlHeight()
+{
+ // if a fixed tab ctrl height is specified,
+ // just return that instead of calculating a
+ // tab height
+ if (m_requested_tabctrl_height != -1)
+ return m_requested_tabctrl_height;
+
+ // find out new best tab height
+ wxAuiTabArt* art = m_tabs.GetArtProvider();
+
+ return art->GetBestTabCtrlSize(this,
+ m_tabs.GetPages(),
+ m_requested_bmp_size);
}
-wxAuiTabArt* wxAuiNotebook::GetArtProvider()
+
+wxAuiTabArt* wxAuiNotebook::GetArtProvider() const
{
return m_tabs.GetArtProvider();
}
void wxAuiNotebook::SetWindowStyleFlag(long style)
{
wxControl::SetWindowStyleFlag(style);
-
+
m_flags = (unsigned int)style;
-
+
// if the control is already initialized
if (m_mgr.GetManagedWindow() == (wxWindow*)this)
{
// let all of the tab children know about the new style
-
+
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;
- wxAuiTabCtrl* tabctrl = ((wxTabFrame*)pane.window)->m_tabs;
+ wxTabFrame* tabframe = (wxTabFrame*)pane.window;
+ wxAuiTabCtrl* tabctrl = tabframe->m_tabs;
tabctrl->SetFlags(m_flags);
+ tabframe->DoSizing();
tabctrl->Refresh();
tabctrl->Update();
}
m_tabs.InsertPage(page, info, page_idx);
+ // if that was the first page added, even if
+ // select is false, it must become the "current page"
+ // (though no select events will be fired)
+ if (!select && m_tabs.GetPageCount() == 1)
+ select = true;
+ //m_curpage = GetPageIndex(page);
+
wxAuiTabCtrl* active_tabctrl = GetActiveTabCtrl();
if (page_idx >= active_tabctrl->GetPageCount())
active_tabctrl->AddPage(page, info);
else
active_tabctrl->InsertPage(page, info, page_idx);
+ UpdateTabCtrlHeight();
DoSizing();
active_tabctrl->DoShowHide();
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;
// DeletePage() removes a tab from the multi-notebook,
// and destroys the window as well
bool wxAuiNotebook::DeletePage(size_t page_idx)
-{
+{
wxWindow* wnd = m_tabs.GetWindowFromIdx(page_idx);
if (!RemovePage(page_idx))
return false;
-
// actually destroy the window now
if (wnd->IsKindOf(CLASSINFO(wxAuiMDIChildFrame)))
{
{
wnd->Destroy();
}
-
+
return true;
}
if (new_active)
{
m_curpage = -1;
- SetSelection(m_tabs.GetIdxFromWindow(new_active));
+ SetSelectionToWindow(new_active);
}
-
+
return true;
}
+// GetPageIndex() returns the index of the page, or -1 if the
+// page could not be located in the notebook
+int wxAuiNotebook::GetPageIndex(wxWindow* page_wnd) const
+{
+ return m_tabs.GetIdxFromWindow(page_wnd);
+}
+
+
+
// SetPageText() changes the tab caption of the specified page
bool wxAuiNotebook::SetPageText(size_t page_idx, const wxString& text)
{
return true;
}
+// returns the page caption
+wxString wxAuiNotebook::GetPageText(size_t page_idx) const
+{
+ if (page_idx >= m_tabs.GetPageCount())
+ return wxEmptyString;
+
+ // update our own tab catalog
+ const wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx);
+ return page_info.caption;
+}
+
+bool wxAuiNotebook::SetPageBitmap(size_t page_idx, const wxBitmap& bitmap)
+{
+ if (page_idx >= m_tabs.GetPageCount())
+ return false;
+
+ // update our own tab catalog
+ wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx);
+ page_info.bitmap = bitmap;
+
+ // tab height might have changed
+ UpdateTabCtrlHeight();
+
+ // update what's on screen
+ wxAuiTabCtrl* ctrl;
+ int ctrl_idx;
+ if (FindTab(page_info.window, &ctrl, &ctrl_idx))
+ {
+ wxAuiNotebookPage& info = ctrl->GetPage(ctrl_idx);
+ info.bitmap = bitmap;
+ ctrl->Refresh();
+ ctrl->Update();
+ }
+
+ return true;
+}
+
+// returns the page bitmap
+wxBitmap wxAuiNotebook::GetPageBitmap(size_t page_idx) const
+{
+ if (page_idx >= m_tabs.GetPageCount())
+ return wxBitmap();
+
+ // update our own tab catalog
+ const wxAuiNotebookPage& page_info = m_tabs.GetPage(page_idx);
+ return page_info.bitmap;
+}
+
// GetSelection() returns the index of the currently active page
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;
evt.SetEventObject(this);
if (!GetEventHandler()->ProcessEvent(evt) || evt.IsAllowed())
{
+ int old_curpage = m_curpage;
+ m_curpage = new_page;
+
// program allows the page change
evt.SetEventType(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED);
(void)GetEventHandler()->ProcessEvent(evt);
-
wxAuiTabCtrl* ctrl;
int ctrl_idx;
if (FindTab(wnd, &ctrl, &ctrl_idx))
DoSizing();
ctrl->DoShowHide();
- int old_curpage = m_curpage;
- m_curpage = new_page;
// set fonts
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
return false;
}
-
-void wxAuiNotebook::OnEraseBackground(wxEraseEvent&)
+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;
+ src_tabs = NULL;
+ if (!FindTab(wnd, &src_tabs, &src_idx))
+ return;
+ if (!src_tabs || src_idx == -1)
+ return;
+
+ // choose a split size
+ wxSize split_size;
+ if (GetPageCount() > 2)
+ {
+ split_size = CalculateNewSplitSize();
+ }
+ else
+ {
+ // because there are two panes, always split them
+ // equally
+ split_size = GetClientSize();
+ 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);
+ new_tabs->SetTabCtrlHeight(m_tab_ctrl_height);
+ new_tabs->m_tabs = new wxAuiTabCtrl(this,
+ m_tab_id_counter++,
+ wxDefaultPosition,
+ wxDefaultSize,
+ wxNO_BORDER);
+ new_tabs->m_tabs->SetArtProvider(m_tabs.GetArtProvider()->Clone());
+ new_tabs->m_tabs->SetFlags(m_flags);
+ dest_tabs = new_tabs->m_tabs;
+
+ // create a pane info structure with the information
+ // 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)
+ {
+ pane_info.Right();
+ mouse_pt = wxPoint(cli_size.x, cli_size.y/2);
+ }
+ else if (direction == wxTOP)
+ {
+ pane_info.Top();
+ mouse_pt = wxPoint(cli_size.x/2, 0);
+ }
+ 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;
+ src_tabs->RemovePage(page_info.window);
+ if (src_tabs->GetPageCount() > 0)
+ {
+ src_tabs->SetActivePage((size_t)0);
+ src_tabs->DoShowHide();
+ src_tabs->Refresh();
+ }
+
+
+ // add the page to the destination tabs
+ dest_tabs->InsertPage(page_info.window, page_info, 0);
+
+ if (src_tabs->GetPageCount() == 0)
+ {
+ RemoveEmptyTabFrames();
+ }
+
+ DoSizing();
+ dest_tabs->DoShowHide();
+ dest_tabs->Refresh();
+
+ // force the set selection function reset the selection
+ m_curpage = -1;
+
+ // set the active page to the one we just split off
+ SetSelectionToPage(page_info);
+
+ UpdateHintWindowSize();
}
-void wxAuiNotebook::OnSize(wxSizeEvent&)
+
+void wxAuiNotebook::OnSize(wxSizeEvent& evt)
{
+ UpdateHintWindowSize();
+
+ evt.Skip();
}
void wxAuiNotebook::OnTabClicked(wxCommandEvent& command_evt)
wxWindow* wnd = ctrl->GetWindowFromIdx(evt.GetSelection());
wxASSERT(wnd != NULL);
- int idx = m_tabs.GetIdxFromWindow(wnd);
- wxASSERT(idx != -1);
-
- SetSelection(idx);
+ SetSelectionToWindow(wnd);
}
void wxAuiNotebook::OnTabBeginDrag(wxCommandEvent&)
wxAuiTabCtrl* src_tabs = (wxAuiTabCtrl*)evt.GetEventObject();
wxAuiTabCtrl* dest_tabs = GetTabCtrlFromPoint(client_pt);
-
+
if (dest_tabs == src_tabs)
{
if (src_tabs)
{
src_tabs->SetCursor(wxCursor(wxCURSOR_ARROW));
}
-
+
// always hide the hint for inner-tabctrl drag
m_mgr.HideHint();
-
+
// if tab moving is not allowed, leave
if (!(m_flags & wxAUI_NB_TAB_MOVE))
{
return;
}
-
+
wxPoint pt = dest_tabs->ScreenToClient(screen_pt);
wxWindow* dest_location_tab;
-
+
// this is an inner-tab drag/reposition
if (dest_tabs->TabHitTest(pt.x, pt.y, &dest_location_tab))
{
int src_idx = evt.GetSelection();
int dest_idx = dest_tabs->GetIdxFromWindow(dest_location_tab);
-
+
// prevent jumpy drag
if ((src_idx == dest_idx) || dest_idx == -1 ||
(src_idx > dest_idx && m_last_drag_x <= pt.x) ||
m_last_drag_x = pt.x;
}
-
+
return;
}
if (m_flags & wxAUI_NB_TAB_EXTERNAL_MOVE)
{
wxWindow* tab_ctrl = ::wxFindWindowAtPoint(screen_pt);
-
+
+ // if we aren't over any window, stop here
+ if (!tab_ctrl)
+ return;
+
// make sure we are not over the hint window
- if (tab_ctrl && !tab_ctrl->IsKindOf(CLASSINFO(wxFrame)))
+ if (!tab_ctrl->IsKindOf(CLASSINFO(wxFrame)))
{
while (tab_ctrl)
{
break;
tab_ctrl = tab_ctrl->GetParent();
}
-
+
if (tab_ctrl)
{
wxAuiNotebook* nb = (wxAuiNotebook*)tab_ctrl->GetParent();
-
+
if (nb != this)
{
- wxRect hint_rect = tab_ctrl->GetRect();
+ wxRect hint_rect = tab_ctrl->GetClientRect();
tab_ctrl->ClientToScreen(&hint_rect.x, &hint_rect.y);
m_mgr.ShowHint(hint_rect);
return;
}
-
+ }
+ }
+ else
+ {
+ if (!dest_tabs)
+ {
+ // we are either over a hint window, or not over a tab
+ // window, and there is no where to drag to, so exit
+ return;
}
}
}
+ // if there are less than two panes, split can't happen, so leave
+ if (m_tabs.GetPageCount() < 2)
+ return;
+
// if tab moving is not allowed, leave
if (!(m_flags & wxAUI_NB_TAB_SPLIT))
- {
return;
- }
if (src_tabs)
{
src_tabs->SetCursor(wxCursor(wxCURSOR_SIZING));
}
-
-
+
+
if (dest_tabs)
{
wxRect hint_rect = dest_tabs->GetRect();
m_mgr.HideHint();
-
+
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();
wxPoint mouse_client_pt = ScreenToClient(mouse_screen_pt);
if (m_flags & wxAUI_NB_TAB_EXTERNAL_MOVE)
{
wxWindow* tab_ctrl = ::wxFindWindowAtPoint(mouse_screen_pt);
-
+
while (tab_ctrl)
{
if (tab_ctrl->IsKindOf(CLASSINFO(wxAuiTabCtrl)))
break;
tab_ctrl = tab_ctrl->GetParent();
}
-
+
if (tab_ctrl)
{
wxAuiNotebook* nb = (wxAuiNotebook*)tab_ctrl->GetParent();
-
+
if (nb != this)
{
// find out from the destination control
e.SetEventObject(this);
e.SetDragSource(this);
e.Veto(); // dropping must be explicitly approved by control owner
-
+
nb->GetEventHandler()->ProcessEvent(e);
-
+
if (!e.IsAllowed())
{
// no answer or negative answer
m_mgr.HideHint();
return;
}
-
+
// drop was allowed
int src_idx = evt.GetSelection();
wxWindow* src_page = src_tabs->GetWindowFromIdx(src_idx);
-
+
// 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);
-
+
// reparent the page
src_page->Reparent(nb);
-
-
+
+
// found out the insert idx
wxAuiTabCtrl* dest_tabs = (wxAuiTabCtrl*)tab_ctrl;
wxPoint pt = dest_tabs->ScreenToClient(mouse_screen_pt);
insert_idx = dest_tabs->GetIdxFromWindow(target);
}
-
+
// add the page to the new notebook
if (insert_idx == -1)
insert_idx = dest_tabs->GetPageCount();
nb->DoSizing();
dest_tabs->DoShowHide();
dest_tabs->Refresh();
-
+
// set the selection in the destination tab control
- nb->SetSelection(nb->m_tabs.GetIdxFromWindow(page_info.window));
+ nb->SetSelectionToPage(page_info);
return;
}
// only perform a tab split if it's allowed
- if (m_flags & wxAUI_NB_TAB_SPLIT)
+ 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
wxWindow* hit_wnd = ::wxFindWindowAtPoint(mouse_screen_pt);
if (dest_tabs == src_tabs)
return;
-
-
+
+
wxPoint pt = dest_tabs->ScreenToClient(mouse_screen_pt);
wxWindow* target = NULL;
dest_tabs->TabHitTest(pt.x, pt.y, &target);
insert_idx = dest_tabs->GetIdxFromWindow(target);
}
}
- else
+ else
{
+ wxPoint zero(0,0);
+ wxRect rect = m_mgr.CalculateHintRect(m_dummy_wnd,
+ mouse_client_pt,
+ zero);
+ if (rect.IsEmpty())
+ {
+ // there is no suitable drop location here, exit out
+ return;
+ }
+
// If there is no tabframe at all, create one
wxTabFrame* new_tabs = new wxTabFrame;
+ new_tabs->m_rect = wxRect(wxPoint(0,0), CalculateNewSplitSize());
new_tabs->SetTabCtrlHeight(m_tab_ctrl_height);
new_tabs->m_tabs = new wxAuiTabCtrl(this,
m_tab_id_counter++,
dest_tabs->DoShowHide();
dest_tabs->Refresh();
- SetSelection(m_tabs.GetIdxFromWindow(page_info.window));
+ // force the set selection function reset the selection
+ m_curpage = -1;
+
+ // set the active page to the one we just split off
+ SetSelectionToPage(page_info);
+
+ UpdateHintWindowSize();
}
}
{
close_wnd->Close();
}
- else
+ else
{
int main_idx = m_tabs.GetIdxFromWindow(close_wnd);
+ wxCHECK_RET( main_idx != wxNOT_FOUND, _T("no page to delete?") );
+
DeletePage(main_idx);
}
}
}
}
+// 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;
+}
#endif // wxUSE_AUI
projects / wxWidgets.git / blobdiff