#pragma hdrstop
#endif
-#include "wx/ribbon/art.h"
-
#if wxUSE_RIBBON
+#include "wx/ribbon/art.h"
#include "wx/ribbon/art_internal.h"
-#include "wx/ribbon/bar.h"
#include "wx/ribbon/buttonbar.h"
#include "wx/ribbon/gallery.h"
#include "wx/ribbon/toolbar.h"
#ifndef WX_PRECOMP
+#include "wx/dcmemory.h"
#endif
#ifdef __WXMSW__
" xxx ",
" x "};
+static const char* const panel_extension_xpm[] = {
+ "7 7 2 1",
+ " c None",
+ "x c #FF00FF",
+ "xxxxxx ",
+ "x ",
+ "x ",
+ "x x x",
+ "x xxx",
+ "x xxx",
+ " xxxx"};
+
+static const char* const panel_toggle_down_xpm[] = {
+ "7 9 2 1",
+ " c None",
+ "x c #FF00FF",
+ " ",
+ "x x",
+ "xx xx",
+ " xx xx ",
+ "x xxx x",
+ "xx x xx",
+ " xx xx ",
+ " xxx ",
+ " x ",};
+
+static const char* const panel_toggle_up_xpm[] = {
+ "7 9 2 1",
+ " c None",
+ "x c #FF00FF",
+ " x ",
+ " xxx ",
+ " xx xx ",
+ "xx x xx",
+ "x xxx x",
+ " xx xx ",
+ "xx xx",
+ "x x",
+ " ",};
+
+static const char* const ribbon_toggle_pin_xpm[] = {
+ "12 9 3 1",
+ " c None",
+ "x c #FF00FF",
+ ". c #FF00FF",
+ " xx ",
+ " x.x xxx",
+ " x..xxx..x",
+ "xxxx.......x",
+ "x..........x",
+ "xxxx.......x",
+ " x..xxx..x",
+ " x.x xxx",
+ " xx "
+};
+
+static const char * const ribbon_help_button_xpm[] = {
+"12 12 112 2",
+" c #163B95",
+". c none",
+"X c #1B3F98",
+"o c #1B4097",
+"O c #1D4198",
+"+ c #1E4298",
+"@ c #1E439B",
+"# c #1A419F",
+"$ c #1E439D",
+"% c #204398",
+"& c #204399",
+"* c #25479B",
+"= c #25489A",
+"- c #284A9D",
+"; c #2A4C9D",
+": c #30519E",
+"> c #3B589A",
+", c #3D599B",
+"< c #1840A2",
+"1 c #1E45A1",
+"2 c #1E4AB4",
+"3 c #2D4FA0",
+"4 c #224AAC",
+"5 c #254DAC",
+"6 c #294FA9",
+"7 c #2B52AE",
+"8 c #3051A0",
+"9 c #3354A0",
+"0 c #3354A2",
+"q c #3454A3",
+"w c #3456A4",
+"e c #3556A4",
+"r c #3C5BA3",
+"t c #395AA6",
+"y c #3E5CA6",
+"u c #3E5DA7",
+"i c #3F5EA6",
+"p c #2A51B0",
+"a c #2E55B5",
+"s c #2752BA",
+"d c #3058B8",
+"f c #3F61B2",
+"g c #415FA7",
+"h c #4562A7",
+"j c #4864A7",
+"k c #4D67A5",
+"l c #4361A8",
+"z c #4361A9",
+"x c #4663A8",
+"c c #4563AA",
+"v c #4764AA",
+"b c #4B68AE",
+"n c #506AA8",
+"m c #516DAD",
+"M c #546EAC",
+"N c #5F75AB",
+"B c #5A72AC",
+"V c #5C77B6",
+"C c #6C7DA7",
+"Z c #6077AD",
+"A c #687DAF",
+"S c #637BB4",
+"D c #687FB7",
+"F c #2D59C1",
+"G c #2E5AC2",
+"H c #2F5ECE",
+"J c #3763CC",
+"K c #4169CB",
+"L c #7787AC",
+"P c #7E8CAE",
+"I c #7A8BB5",
+"U c #7B8CB4",
+"Y c #7C8FBD",
+"T c #758FCA",
+"R c #808CA8",
+"E c #969DAF",
+"W c #8291B4",
+"Q c #8A95B0",
+"! c #8B96B1",
+"~ c #8F9AB3",
+"^ c #8D98B5",
+"/ c #8E9AB7",
+"( c #8997B8",
+") c #949EB9",
+"_ c #99A1B4",
+"` c #ADAFB7",
+"' c #A5ABB8",
+"] c #A6ABB8",
+"[ c #AAAFBE",
+"{ c #AFB2BE",
+"} c #B0B1B6",
+"| c #BAB8B6",
+" . c #B4B5BC",
+".. c #B6B9BF",
+"X. c #BBB9B8",
+"o. c #8C9DC3",
+"O. c #8EA3D4",
+"+. c #97AAD4",
+"@. c #ACB5C9",
+"#. c #B3B7C0",
+"$. c #A1B1D5",
+"%. c #BAC3D7",
+"&. c #BEC6D6",
+"*. c #D7D2C7",
+"=. c #C2C8D6",
+"-. c #D2D6DF",
+";. c #E8E4DA",
+":. c #CED5E4",
+">. c #FFF9EC",
+",. c #F3F4F5",
+"<. c #F6F8FB",
+"1. c None",
+/* pixels */
+"1.1.1.1.#./ W ~ } 1.1.1.",
+"1.1.1.U r c b t h Q 1.1.",
+"1.1.A 3 $.<.,.&.m w ^ 1.",
+"1.( 0 z :.%.=.;.) e x ` ",
+"1.n u v M * B *.R O @ P ",
+"' i z l - 9 { | > $ # Z ",
+"_ y l ; & [ X., 1 6 4 D ",
+"] g 8 o : .C < 7 a s o.",
+"1.k X % = I S 5 d G K ..",
+"1.! . j >.-.p F H +.1.",
+"1.1.L X + Y V 2 J O.1.1.",
+"1.1.1.E N q f T @.1.1.1."
+};
+
wxRibbonMSWArtProvider::wxRibbonMSWArtProvider(bool set_colour_scheme)
{
m_flags = 0;
- m_tab_label_font = wxFont(8, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE);
+#if defined( __WXMAC__ )
+ m_tab_label_font = *wxSMALL_FONT;
+#else
+ m_tab_label_font = *wxNORMAL_FONT;
+#endif
m_button_bar_label_font = m_tab_label_font;
m_panel_label_font = m_tab_label_font;
m_gallery_bitmap_padding_right_size = 4;
m_gallery_bitmap_padding_top_size = 4;
m_gallery_bitmap_padding_bottom_size = 4;
+ m_toggle_button_offset = 22;
+ m_help_button_offset = 22;
}
wxRibbonMSWArtProvider::~wxRibbonMSWArtProvider()
// tertiary not used for anything
// Map primary saturation from [0, 1] to [.25, .75]
- primary_hsl.saturation = cos(primary_hsl.saturation * M_PI) * -0.25 + 0.5;
+ bool primary_is_gray = false;
+ static const double gray_saturation_threshold = 0.01;
+ if(primary_hsl.saturation <= gray_saturation_threshold)
+ primary_is_gray = true;
+ else
+ {
+ primary_hsl.saturation = cos(primary_hsl.saturation * M_PI)
+ * -0.25 + 0.5;
+ }
// Map primary luminance from [0, 1] to [.23, .83]
primary_hsl.luminance = cos(primary_hsl.luminance * M_PI) * -0.3 + 0.53;
// Map secondary saturation from [0, 1] to [0.16, 0.84]
- secondary_hsl.saturation = cos(secondary_hsl.saturation * M_PI) * -0.34 + 0.5;
+ bool secondary_is_gray = false;
+ if(secondary_hsl.saturation <= gray_saturation_threshold)
+ secondary_is_gray = true;
+ else
+ {
+ secondary_hsl.saturation = cos(secondary_hsl.saturation * M_PI)
+ * -0.34 + 0.5;
+ }
// Map secondary luminance from [0, 1] to [0.1, 0.9]
secondary_hsl.luminance = cos(secondary_hsl.luminance * M_PI) * -0.4 + 0.5;
#define LikePrimary(h, s, l) \
- primary_hsl.ShiftHue(h ## f).Saturated(s ## f).Lighter(l ## f).ToRGB()
+ primary_hsl.ShiftHue(h ## f).Saturated(primary_is_gray ? 0 : s ## f) \
+ .Lighter(l ## f).ToRGB()
#define LikeSecondary(h, s, l) \
- secondary_hsl.ShiftHue(h ## f).Saturated(s ## f).Lighter(l ## f).ToRGB()
+ secondary_hsl.ShiftHue(h ## f).Saturated(secondary_is_gray ? 0 : s ## f) \
+ .Lighter(l ## f).ToRGB()
m_page_border_pen = LikePrimary(1.4, 0.00, -0.08);
m_tab_ctrl_background_brush = LikePrimary(1.0, 0.39, 0.07);
m_tab_hover_background_colour = LikePrimary(1.3, 0.15, 0.10);
m_tab_hover_background_top_colour = LikePrimary(1.4, 0.36, 0.08);
- m_tab_border_pen = LikePrimary(1.4, 0.03, -0.05);
+ m_tab_border_pen = LikePrimary(1.4, 0.03, -0.05);
m_tab_separator_gradient_colour = LikePrimary(1.7, -0.15, -0.18);
- m_tab_hover_background_top_gradient_colour = LikePrimary(1.8, 0.34, 0.13);
+ m_tab_hover_background_top_gradient_colour = LikePrimary(1.8, 0.34, 0.13);
m_tab_label_colour = LikePrimary(4.3, 0.13, -0.49);
m_tab_hover_background_gradient_colour = LikeSecondary(-1.5, -0.34, 0.01);
m_panel_label_colour = LikePrimary(2.8, -0.14, -0.35);
m_panel_hover_label_colour = m_panel_label_colour;
m_panel_minimised_label_colour = m_tab_label_colour;
+ m_panel_hover_button_background_brush = LikeSecondary(-0.9, 0.16, -0.07);
+ m_panel_hover_button_border_pen = LikeSecondary(-3.9, -0.16, -0.14);
+ SetColour(wxRIBBON_ART_PANEL_BUTTON_FACE_COLOUR, LikePrimary(1.4, -0.21, -0.23));
+ SetColour(wxRIBBON_ART_PANEL_BUTTON_HOVER_FACE_COLOUR, LikePrimary(1.5, -0.24, -0.29));
+
+ m_ribbon_toggle_brush = LikeSecondary(-0.9, 0.16, -0.07);
+ m_ribbon_toggle_pen = LikeSecondary(-3.9, -0.16, -0.14);
+ SetColour(wxRIBBON_ART_PAGE_TOGGLE_FACE_COLOUR, LikePrimary(1.7, -0.20, -0.15));
+ SetColour(wxRIBBON_ART_PAGE_TOGGLE_HOVER_FACE_COLOUR, LikePrimary(1.8, -0.23, -0.21));
m_gallery_button_disabled_background_colour = LikePrimary(-2.8, -0.46, 0.09);
- m_gallery_button_disabled_background_top_brush = LikePrimary(-2.8, -0.36, 0.15);
+ m_gallery_button_disabled_background_top_brush = LikePrimary(-2.8, -0.36, 0.15);
m_gallery_hover_background_brush = LikePrimary(-0.8, 0.05, 0.15);
m_gallery_border_pen = LikePrimary(0.7, -0.02, 0.03);
m_gallery_button_background_top_brush = LikePrimary(0.8, 0.34, 0.13);
m_gallery_button_active_background_colour = LikeSecondary(-9.9, 0.03, -0.22);
m_gallery_button_active_background_gradient_colour = LikeSecondary(-9.5, 0.14, -0.11);
m_gallery_button_active_background_top_brush = LikeSecondary(-9.0, 0.15, -0.08);
-
+
m_button_bar_label_colour = m_tab_label_colour;
+ m_button_bar_label_disabled_colour = m_tab_label_colour;
+
m_button_bar_hover_border_pen = LikeSecondary(-6.2, -0.47, -0.14);
m_button_bar_hover_background_gradient_colour = LikeSecondary(-0.6, 0.16, 0.04);
m_button_bar_hover_background_colour = LikeSecondary(-0.2, 0.16, -0.10);
void wxRibbonMSWArtProvider::CloneTo(wxRibbonMSWArtProvider* copy) const
{
- for(int i = 0; i < 4; ++i)
+ int i;
+ for(i = 0; i < 4; ++i)
{
copy->m_gallery_up_bitmap[i] = m_gallery_up_bitmap[i];
copy->m_gallery_down_bitmap[i] = m_gallery_down_bitmap[i];
copy->m_gallery_extension_bitmap[i] = m_gallery_extension_bitmap[i];
}
+ for(i = 0; i < 2; ++i)
+ {
+ copy->m_panel_extension_bitmap[i] = m_panel_extension_bitmap[i];
+ copy->m_ribbon_toggle_up_bitmap[i] = m_ribbon_toggle_up_bitmap[i];
+ copy->m_ribbon_toggle_down_bitmap[i] = m_ribbon_toggle_down_bitmap[i];
+ copy->m_ribbon_toggle_pin_bitmap[i] = m_ribbon_toggle_pin_bitmap[i];
+ copy->m_ribbon_bar_help_button_bitmap[i] = m_ribbon_bar_help_button_bitmap[i];
+ }
copy->m_toolbar_drop_bitmap = m_toolbar_drop_bitmap;
copy->m_primary_scheme_colour = m_primary_scheme_colour;
copy->m_secondary_scheme_colour = m_secondary_scheme_colour;
copy->m_tertiary_scheme_colour = m_tertiary_scheme_colour;
+ copy->m_page_toggle_face_colour = m_page_toggle_face_colour;
+ copy->m_page_toggle_hover_face_colour = m_page_toggle_hover_face_colour;
+
copy->m_button_bar_label_colour = m_button_bar_label_colour;
+ copy->m_button_bar_label_disabled_colour = m_button_bar_label_disabled_colour;
copy->m_tab_label_colour = m_tab_label_colour;
copy->m_tab_separator_colour = m_tab_separator_colour;
copy->m_tab_separator_gradient_colour = m_tab_separator_gradient_colour;
copy->m_panel_label_colour = m_panel_label_colour;
copy->m_panel_hover_label_colour = m_panel_hover_label_colour;
copy->m_panel_minimised_label_colour = m_panel_minimised_label_colour;
+ copy->m_panel_button_face_colour = m_panel_button_face_colour;
+ copy->m_panel_button_hover_face_colour = m_panel_button_hover_face_colour;
copy->m_panel_active_background_colour = m_panel_active_background_colour;
copy->m_panel_active_background_gradient_colour = m_panel_active_background_gradient_colour;
copy->m_panel_active_background_top_colour = m_panel_active_background_top_colour;
copy->m_button_bar_active_background_top_colour = m_button_bar_active_background_top_colour;
copy->m_button_bar_active_background_top_gradient_colour = m_button_bar_active_background_top_gradient_colour;
copy->m_gallery_button_background_colour = m_gallery_button_background_colour;
- copy->m_gallery_button_background_gradient_colour = m_gallery_button_background_gradient_colour;
+ copy->m_gallery_button_background_gradient_colour = m_gallery_button_background_gradient_colour;
copy->m_gallery_button_hover_background_colour = m_gallery_button_hover_background_colour;
copy->m_gallery_button_hover_background_gradient_colour = m_gallery_button_hover_background_gradient_colour;
copy->m_gallery_button_active_background_colour = m_gallery_button_active_background_colour;
copy->m_tab_ctrl_background_brush = m_tab_ctrl_background_brush;
copy->m_panel_label_background_brush = m_panel_label_background_brush;
copy->m_panel_hover_label_background_brush = m_panel_hover_label_background_brush;
+ copy->m_panel_hover_button_background_brush = m_panel_hover_button_background_brush;
copy->m_gallery_hover_background_brush = m_gallery_hover_background_brush;
copy->m_gallery_button_background_top_brush = m_gallery_button_background_top_brush;
copy->m_gallery_button_hover_background_top_brush = m_gallery_button_hover_background_top_brush;
copy->m_gallery_button_active_background_top_brush = m_gallery_button_active_background_top_brush;
copy->m_gallery_button_disabled_background_top_brush = m_gallery_button_disabled_background_top_brush;
+ copy->m_ribbon_toggle_brush = m_ribbon_toggle_brush;
copy->m_tab_label_font = m_tab_label_font;
copy->m_button_bar_label_font = m_button_bar_label_font;
copy->m_panel_border_gradient_pen = m_panel_border_gradient_pen;
copy->m_panel_minimised_border_pen = m_panel_minimised_border_pen;
copy->m_panel_minimised_border_gradient_pen = m_panel_minimised_border_gradient_pen;
+ copy->m_panel_hover_button_border_pen = m_panel_hover_button_border_pen;
copy->m_tab_border_pen = m_tab_border_pen;
copy->m_gallery_border_pen = m_gallery_border_pen;
copy->m_button_bar_hover_border_pen = m_button_bar_hover_border_pen;
copy->m_button_bar_active_border_pen = m_button_bar_active_border_pen;
copy->m_gallery_item_border_pen = m_gallery_item_border_pen;
copy->m_toolbar_border_pen = m_toolbar_border_pen;
+ copy->m_ribbon_toggle_pen = m_ribbon_toggle_pen;
copy->m_flags = m_flags;
copy->m_tab_separation_size = m_tab_separation_size;
Reload(wxRIBBON_ART_GALLERY_BUTTON_HOVER_FACE_COLOUR);
Reload(wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_FACE_COLOUR);
Reload(wxRIBBON_ART_GALLERY_BUTTON_DISABLED_FACE_COLOUR);
+ Reload(wxRIBBON_ART_PANEL_BUTTON_FACE_COLOUR);
+ Reload(wxRIBBON_ART_PANEL_BUTTON_HOVER_FACE_COLOUR);
#undef Reload
}
{
case wxRIBBON_ART_BUTTON_BAR_LABEL_COLOUR:
return m_button_bar_label_colour;
+ case wxRIBBON_ART_BUTTON_BAR_LABEL_DISABLED_COLOUR:
+ return m_button_bar_label_disabled_colour;
case wxRIBBON_ART_BUTTON_BAR_HOVER_BORDER_COLOUR:
return m_button_bar_hover_border_pen.GetColour();
case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_TOP_COLOUR:
return m_panel_active_background_colour;
case wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_GRADIENT_COLOUR:
return m_panel_active_background_gradient_colour;
+ case wxRIBBON_ART_PANEL_BUTTON_FACE_COLOUR:
+ return m_panel_button_face_colour;
+ case wxRIBBON_ART_PANEL_BUTTON_HOVER_FACE_COLOUR:
+ return m_panel_button_hover_face_colour;
case wxRIBBON_ART_PAGE_BORDER_COLOUR:
return m_page_border_pen.GetColour();
case wxRIBBON_ART_PAGE_BACKGROUND_TOP_COLOUR:
return m_toolbar_border_pen.GetColour();
case wxRIBBON_ART_TOOLBAR_FACE_COLOUR:
return m_tool_face_colour;
+ case wxRIBBON_ART_PAGE_TOGGLE_FACE_COLOUR:
+ return m_page_toggle_face_colour;
+ case wxRIBBON_ART_PAGE_TOGGLE_HOVER_FACE_COLOUR:
+ return m_page_toggle_hover_face_colour;
default:
wxFAIL_MSG(wxT("Invalid Metric Ordinal"));
break;
case wxRIBBON_ART_BUTTON_BAR_LABEL_COLOUR:
m_button_bar_label_colour = colour;
break;
+ case wxRIBBON_ART_BUTTON_BAR_LABEL_DISABLED_COLOUR:
+ m_button_bar_label_disabled_colour = colour;
+ break;
case wxRIBBON_ART_BUTTON_BAR_HOVER_BORDER_COLOUR:
m_button_bar_hover_border_pen.SetColour(colour);
break;
case wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_GRADIENT_COLOUR:
m_panel_active_background_gradient_colour = colour;
break;
+ case wxRIBBON_ART_PANEL_BUTTON_FACE_COLOUR:
+ m_panel_button_face_colour = colour;
+ m_panel_extension_bitmap[0] = wxRibbonLoadPixmap(panel_extension_xpm, colour);
+ break;
+ case wxRIBBON_ART_PANEL_BUTTON_HOVER_FACE_COLOUR:
+ m_panel_button_hover_face_colour = colour;
+ m_panel_extension_bitmap[1] = wxRibbonLoadPixmap(panel_extension_xpm, colour);
+ break;
case wxRIBBON_ART_PAGE_BORDER_COLOUR:
m_page_border_pen.SetColour(colour);
break;
m_tool_face_colour = colour;
m_toolbar_drop_bitmap = wxRibbonLoadPixmap(gallery_down_xpm, colour);
break;
+ case wxRIBBON_ART_PAGE_TOGGLE_FACE_COLOUR:
+ m_page_toggle_face_colour = colour;
+ m_ribbon_toggle_down_bitmap[0] = wxRibbonLoadPixmap(panel_toggle_down_xpm, colour);
+ m_ribbon_toggle_up_bitmap[0] = wxRibbonLoadPixmap(panel_toggle_up_xpm, colour);
+ m_ribbon_toggle_pin_bitmap[0] = wxRibbonLoadPixmap(ribbon_toggle_pin_xpm, colour);
+ m_ribbon_bar_help_button_bitmap[0] = wxRibbonLoadPixmap(ribbon_help_button_xpm, colour);
+ break;
+ case wxRIBBON_ART_PAGE_TOGGLE_HOVER_FACE_COLOUR:
+ m_page_toggle_hover_face_colour = colour;
+ m_ribbon_toggle_down_bitmap[1] = wxRibbonLoadPixmap(panel_toggle_down_xpm, colour);
+ m_ribbon_toggle_up_bitmap[1] = wxRibbonLoadPixmap(panel_toggle_up_xpm, colour);
+ m_ribbon_toggle_pin_bitmap[1] = wxRibbonLoadPixmap(ribbon_toggle_pin_xpm, colour);
+ m_ribbon_bar_help_button_bitmap[1] = wxRibbonLoadPixmap(ribbon_help_button_xpm, colour);
+ break;
default:
wxFAIL_MSG(wxT("Invalid Metric Ordinal"));
break;
if(tab.rect.height <= 2)
return;
- if(tab.active || tab.hovered)
+ if(tab.active || tab.hovered || tab.highlight)
{
if(tab.active)
{
dc.GradientFillLinear(background, m_tab_hover_background_colour,
m_tab_hover_background_gradient_colour, wxSOUTH);
}
+ else if(tab.highlight)
+ {
+ wxRect background(tab.rect);
+
+ background.x += 2;
+ background.y += 2;
+ background.width -= 4;
+ background.height -= 3;
+ int h = background.height;
+ background.height /= 2;
+
+ //For highlight pages we show a colour between the active page and for a hovered page:
+ wxColour top_colour1((m_tab_active_background_colour.Red() + m_tab_hover_background_top_colour.Red())/2,
+ (m_tab_active_background_colour.Green() + m_tab_hover_background_top_colour.Green())/2,
+ (m_tab_active_background_colour.Blue() + m_tab_hover_background_top_colour.Blue())/2);
+
+ wxColour bottom_colour1((m_tab_active_background_gradient_colour.Red() + m_tab_hover_background_top_gradient_colour.Red())/2,
+ (m_tab_active_background_gradient_colour.Green() + m_tab_hover_background_top_gradient_colour.Green())/2,
+ (m_tab_active_background_gradient_colour.Blue() + m_tab_hover_background_top_gradient_colour.Blue())/2);
+
+ dc.GradientFillLinear(background, top_colour1, bottom_colour1, wxSOUTH);
+
+ background.y += background.height;
+ background.height = h - background.height;
+
+ wxColour top_colour2((m_tab_active_background_colour.Red() + m_tab_hover_background_colour.Red())/2,
+ (m_tab_active_background_colour.Green() + m_tab_hover_background_colour.Green())/2,
+ (m_tab_active_background_colour.Blue() + m_tab_hover_background_colour.Blue())/2);
+
+ wxColour bottom_colour2((m_tab_active_background_gradient_colour.Red() + m_tab_hover_background_gradient_colour.Red())/2,
+ (m_tab_active_background_gradient_colour.Green() + m_tab_hover_background_gradient_colour.Green())/2,
+ (m_tab_active_background_gradient_colour.Blue() + m_tab_hover_background_gradient_colour.Blue())/2);
+
+ dc.GradientFillLinear(background, top_colour2, bottom_colour2, wxSOUTH);
+ }
wxPoint border_points[6];
border_points[0] = wxPoint(1, tab.rect.height - 2);
if(m_flags & wxRIBBON_BAR_SHOW_PAGE_ICONS)
{
wxBitmap icon = tab.page->GetIcon();
+ if(icon.IsOk())
+ {
int x = tab.rect.x + 4;
if((m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS) == 0)
x = tab.rect.x + (tab.rect.width - icon.GetWidth()) / 2;
dc.DrawBitmap(icon, x, tab.rect.y + 1 + (tab.rect.height - 1 -
icon.GetHeight()) / 2, true);
+ }
}
if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
{
}
void wxRibbonMSWArtProvider::DrawPartialPageBackground(wxDC& dc,
- wxWindow* WXUNUSED(wnd), const wxRect& rect, wxRibbonPage* page,
+ wxWindow* wnd, const wxRect& r, wxRibbonPage* page,
wxPoint offset, bool hovered)
{
- wxRect background(page->GetSize());
- page->AdjustRectToIncludeScrollButtons(&background);
- background.height -= 2;
+ wxRect background;
+ // Expanded panels need a background - the expanded panel at
+ // best size may have a greater Y dimension higher than when
+ // on the bar if it has a sizer. AUI art provider does not need this
+ // because it paints the panel without reference to its parent's size.
+ // Expanded panels use a wxFrame as parent (not a wxRibbonPage).
+
+ if(wnd->GetSizer() && wnd->GetParent() != page)
+ {
+ background = wnd->GetParent()->GetSize();
+ offset = wxPoint(0,0);
+ }
+ else
+ {
+ background = page->GetSize();
+ page->AdjustRectToIncludeScrollButtons(&background);
+ background.height -= 2;
+ }
// Page background isn't dependant upon the width of the page
// (at least not the part of it intended to be painted by this
// function). Set to wider than the page itself for when externally
lower_rect.y += upper_rect.height;
lower_rect.height -= upper_rect.height;
- wxRect paint_rect(rect);
+ wxRect paint_rect(r);
paint_rect.x += offset.x;
paint_rect.y += offset.y;
wxRect true_rect(rect);
RemovePanelPadding(&true_rect);
+ bool has_ext_button = wnd->HasExtButton();
int label_height;
{
label_rect.SetY(true_rect.GetBottom() - label_rect.GetHeight());
label_height = label_rect.GetHeight();
+ wxRect label_bg_rect = label_rect;
+
+ if(has_ext_button)
+ label_rect.SetWidth(label_rect.GetWidth() - 13);
+
if(label_size.GetWidth() > label_rect.GetWidth())
{
// Test if there is enough length for 3 letters and ...
}
}
- dc.DrawRectangle(label_rect.GetX(), label_rect.GetY(), label_rect.GetWidth(), label_rect.GetHeight());
+ dc.DrawRectangle(label_bg_rect);
if(clip_label)
{
wxDCClipper clip(dc, label_rect);
label_rect.y +
(label_rect.GetHeight() - label_size.GetHeight()) / 2);
}
+
+ if(has_ext_button)
+ {
+ if(wnd->IsExtButtonHovered())
+ {
+ dc.SetPen(m_panel_hover_button_border_pen);
+ dc.SetBrush(m_panel_hover_button_background_brush);
+ dc.DrawRoundedRectangle(label_rect.GetRight(), label_rect.GetBottom() - 13, 13, 13, 1.0);
+ dc.DrawBitmap(m_panel_extension_bitmap[1], label_rect.GetRight() + 3, label_rect.GetBottom() - 10, true);
+ }
+ else
+ dc.DrawBitmap(m_panel_extension_bitmap[0], label_rect.GetRight() + 3, label_rect.GetBottom() - 10, true);
+ }
}
if(wnd->IsHovered())
DrawPanelBorder(dc, true_rect, m_panel_border_pen, m_panel_border_gradient_pen);
}
+wxRect wxRibbonMSWArtProvider::GetPanelExtButtonArea(wxDC& WXUNUSED(dc),
+ const wxRibbonPanel* WXUNUSED(wnd),
+ wxRect rect)
+{
+ RemovePanelPadding(&rect);
+ rect = wxRect(rect.GetRight()-13, rect.GetBottom()-13, 13, 13);
+ return rect;
+}
+
void wxRibbonMSWArtProvider::DrawGalleryBackground(
wxDC& dc,
wxRibbonGallery* wnd,
client_rect.width -= 2;
client_rect.y++;
client_rect.height = (rect.y + rect.height / 5) - client_rect.x;
- dc.GradientFillLinear(client_rect,
+ dc.GradientFillLinear(client_rect,
m_panel_active_background_top_colour,
m_panel_active_background_top_gradient_colour, wxSOUTH);
client_rect.y += client_rect.height;
client_rect.height = (true_rect.y + true_rect.height) - client_rect.y;
- dc.GradientFillLinear(client_rect,
+ dc.GradientFillLinear(client_rect,
m_panel_active_background_colour,
m_panel_active_background_gradient_colour, wxSOUTH);
}
dc.SetTextForeground(m_panel_minimised_label_colour);
dc.DrawText(wnd->GetLabel(), xpos, ypos);
-
+
wxPoint arrow_points[3];
if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
wxPoint offset(wnd->GetPosition());
wxRibbonPage* page = NULL;
wxWindow* parent = wnd->GetParent();
- wxRibbonPanel* panel = NULL;
+ wxRibbonPanel* panel = wxDynamicCast(wnd, wxRibbonPanel);
bool hovered = false;
- panel = wxDynamicCast(wnd, wxRibbonPanel);
if(panel != NULL)
{
hovered = allow_hovered && panel->IsHovered();
const wxBitmap& bitmap_large,
const wxBitmap& bitmap_small)
{
+ if(kind == wxRIBBON_BUTTON_TOGGLE)
+ {
+ kind = wxRIBBON_BUTTON_NORMAL;
+ if(state & wxRIBBON_BUTTONBAR_BUTTON_TOGGLED)
+ state ^= wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK;
+ }
+
if(state & (wxRIBBON_BUTTONBAR_BUTTON_HOVER_MASK |
wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK))
{
}
dc.SetFont(m_button_bar_label_font);
- dc.SetTextForeground(m_button_bar_label_colour);
+ dc.SetTextForeground(state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED
+ ? m_button_bar_label_disabled_colour
+ : m_button_bar_label_colour);
DrawButtonBarButtonForeground(dc, rect, kind, state, label, bitmap_large,
bitmap_small);
}
dc.DrawText(label_bottom, iX, ypos);
if(arrow_width != 0)
{
- DrawDropdownArrow(dc,
+ DrawDropdownArrow(dc,
iX + 2 +label_w - arrow_width,
ypos + label_h / 2 + 1,
m_button_bar_label_colour);
wxRibbonButtonKind kind,
long state)
{
+ if(kind == wxRIBBON_BUTTON_TOGGLE)
+ {
+ if(state & wxRIBBON_TOOLBAR_TOOL_TOGGLED)
+ state ^= wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK;
+ }
+
wxRect bg_rect(rect);
bg_rect.Deflate(1);
if((state & wxRIBBON_TOOLBAR_TOOL_LAST) == 0)
dc.SetBrush(B);
dc.DrawRectangle(nonrect.x, nonrect.y, nonrect.width, nonrect.height);
}
-
+
// Border
dc.SetPen(m_toolbar_border_pen);
if(state & wxRIBBON_TOOLBAR_TOOL_FIRST)
dc.DrawPoint(rect.x + 1, rect.y + rect.height - 2);
}
else
- dc.DrawLine(rect.x, rect.y + 1, rect.x, rect.y + rect.height - 1);
+ dc.DrawLine(rect.x, rect.y + 1, rect.x, rect.y + rect.height - 1);
if(state & wxRIBBON_TOOLBAR_TOOL_LAST)
{
// Foreground
int avail_width = bg_rect.GetWidth();
- if(kind != wxRIBBON_BUTTON_NORMAL)
+ if(kind & wxRIBBON_BUTTON_DROPDOWN)
{
avail_width -= 8;
if(is_split_hybrid)
{
- dc.DrawLine(rect.x + avail_width + 1, rect.y,
+ dc.DrawLine(rect.x + avail_width + 1, rect.y,
rect.x + avail_width + 1, rect.y + rect.height);
}
dc.DrawBitmap(m_toolbar_drop_bitmap, bg_rect.x + avail_width + 2,
bg_rect.y + (bg_rect.height - bitmap.GetHeight()) / 2, true);
}
+void
+wxRibbonMSWArtProvider::DrawToggleButton(wxDC& dc,
+ wxRibbonBar* wnd,
+ const wxRect& rect,
+ wxRibbonDisplayMode mode)
+{
+ int bindex = 0;
+ DrawPartialPageBackground(dc, wnd, rect, false);
+
+ dc.DestroyClippingRegion();
+ dc.SetClippingRegion(rect);
+
+ if(wnd->IsToggleButtonHovered())
+ {
+ dc.SetPen(m_ribbon_toggle_pen);
+ dc.SetBrush(m_ribbon_toggle_brush);
+ dc.DrawRoundedRectangle(rect.GetX(), rect.GetY(), 20, 20, 1.0);
+ bindex = 1;
+ }
+ switch(mode)
+ {
+ case wxRIBBON_BAR_PINNED:
+ dc.DrawBitmap(m_ribbon_toggle_up_bitmap[bindex], rect.GetX()+7, rect.GetY()+6, true);
+ break;
+ case wxRIBBON_BAR_MINIMIZED:
+ dc.DrawBitmap(m_ribbon_toggle_down_bitmap[bindex], rect.GetX()+7, rect.GetY()+6, true);
+ break;
+ case wxRIBBON_BAR_EXPANDED:
+ dc.DrawBitmap(m_ribbon_toggle_pin_bitmap[bindex], rect.GetX ()+4, rect.GetY ()+5, true);
+ break;
+ }
+}
+
+void wxRibbonMSWArtProvider::DrawHelpButton(wxDC& dc,
+ wxRibbonBar* wnd,
+ const wxRect& rect)
+{
+ DrawPartialPageBackground(dc, wnd, rect, false);
+
+ dc.DestroyClippingRegion();
+ dc.SetClippingRegion(rect);
+
+ if ( wnd->IsHelpButtonHovered() )
+ {
+ dc.SetPen(m_ribbon_toggle_pen);
+ dc.SetBrush(m_ribbon_toggle_brush);
+ dc.DrawRoundedRectangle(rect.GetX(), rect.GetY(), 20, 20, 1.0);
+ dc.DrawBitmap(m_ribbon_bar_help_button_bitmap[1], rect.GetX ()+4, rect.GetY()+5, true);
+ }
+ else
+ {
+ dc.DrawBitmap(m_ribbon_bar_help_button_bitmap[0], rect.GetX ()+4, rect.GetY()+5, true);
+ }
+
+}
+
void wxRibbonMSWArtProvider::GetBarTabWidth(
wxDC& dc,
wxWindow* WXUNUSED(wnd),
else
*client_offset = wxPoint(3, 2);
}
+ if (size.x < 0) size.x = 0;
+ if (size.y < 0) size.y = 0;
return size;
}
scroll_down.y = scroll_up.y;
scroll_down.height = scroll_up.height;
scroll_down.x = scroll_up.x + scroll_up.width;
- scroll_down.width = scroll_up.width;
+ scroll_down.width = scroll_up.width;
extension.y = scroll_down.y;
extension.height = scroll_down.height;
extension.x = scroll_down.x + scroll_down.width;
scroll_down.x = scroll_up.x;
scroll_down.width = scroll_up.width;
scroll_down.y = scroll_up.y + scroll_up.height;
- scroll_down.height = scroll_up.height;
+ scroll_down.height = scroll_up.height;
extension.x = scroll_down.x;
extension.width = scroll_down.width;
extension.y = scroll_down.y + scroll_down.height;
size.DecBy(16, 1);
size.DecBy( 2, 1);
}
-
+
if(client_offset != NULL)
*client_offset = wxPoint(2, 1);
if(scroll_up_button != NULL)
switch(kind)
{
case wxRIBBON_BUTTON_NORMAL:
+ case wxRIBBON_BUTTON_TOGGLE:
*normal_region = wxRect(*button_size);
*dropdown_region = wxRect(0, 0, 0, 0);
break;
dropdown_region->SetX(dropdown_region->GetX() + text_size);
// no break
case wxRIBBON_BUTTON_NORMAL:
+ case wxRIBBON_BUTTON_TOGGLE:
normal_region->SetWidth(normal_region->GetWidth() + text_size);
break;
}
wxCoord label_height;
wxCoord best_width;
dc.GetTextExtent(label, &best_width, &label_height);
- int best_num_lines = 1;
int last_line_extra_width = 0;
- if(kind != wxRIBBON_BUTTON_NORMAL)
+ if(kind != wxRIBBON_BUTTON_NORMAL && kind != wxRIBBON_BUTTON_TOGGLE)
{
last_line_extra_width += 8;
- best_num_lines = 2; // label on top line, button below
}
size_t i;
for(i = 0; i < label.Len(); ++i)
if(wxRibbonCanLabelBreakAtPosition(label, i))
{
int width = wxMax(
- dc.GetTextExtent(label.Mid(0, i - 1)).GetWidth(),
+ dc.GetTextExtent(label.Left(i)).GetWidth(),
dc.GetTextExtent(label.Mid(i + 1)).GetWidth() + last_line_extra_width);
if(width < best_width)
{
best_width = width;
- best_num_lines = 2;
}
}
}
dropdown_region->height = icon_size.GetHeight() - normal_region->height;
break;
case wxRIBBON_BUTTON_NORMAL:
+ case wxRIBBON_BUTTON_TOGGLE:
*normal_region = wxRect(icon_size);
break;
}
size.IncBy(7, 6);
if(is_last)
size.IncBy(1, 0);
- if(kind != wxRIBBON_BUTTON_NORMAL)
+ if(kind & wxRIBBON_BUTTON_DROPDOWN)
{
size.IncBy(8, 0);
if(dropdown_region)
return size;
}
+wxRect
+wxRibbonMSWArtProvider::GetBarToggleButtonArea(const wxRect& rect)
+{
+ wxRect rectOut = wxRect(rect.GetWidth()-m_toggle_button_offset, 2, 20, 20);
+ if ( (m_toggle_button_offset==22) && (m_help_button_offset==22) )
+ m_help_button_offset += 22;
+ return rectOut;
+}
+
+wxRect
+wxRibbonMSWArtProvider::GetRibbonHelpButtonArea(const wxRect& rect)
+{
+ wxRect rectOut = wxRect(rect.GetWidth()-m_help_button_offset, 2, 20, 20);
+ if ( (m_toggle_button_offset==22) && (m_help_button_offset==22) )
+ m_toggle_button_offset += 22;
+ return rectOut;
+}
+
#endif // wxUSE_RIBBON
projects / wxWidgets.git / blobdiff