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

Always use wxRibbonBar image lists in wxRibbonButtonBar

Browse Source 
Assume that we can always rely on being a child of wxRibbonBar, and
always use its image lists.
This commit is contained in:
Vadim Zeitlin
2020-02-07 19:29:04 +01:00
parent 10c49631a3
commit ad552d2117
1 changed files with 41 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/ribbon/buttonbar.cpp
View File

@@ -98,66 +98,53 @@ public:
void SetBitmaps(wxRibbonBar* ribbon, void SetBitmaps(wxRibbonBar* ribbon,
wxSize bitmap_size_large, wxSize bitmap_size_large,
wxSize bitmap_size_small, wxSize bitmap_size_small,
const wxBitmap& bitmap_large, wxBitmap bitmap_large,
const wxBitmap& bitmap_large_disabled, wxBitmap bitmap_large_disabled,
const wxBitmap& bitmap_small, wxBitmap bitmap_small,
const wxBitmap& bitmap_small_disabled) wxBitmap bitmap_small_disabled)
{ {
m_bitmap_large = bitmap_large;
if(!bitmap_large.IsOk()) if(!bitmap_large.IsOk())
{ {
m_bitmap_large = MakeResizedBitmap(m_bitmap_small, bitmap_large = MakeResizedBitmap(bitmap_small, bitmap_size_large);
bitmap_size_large);
} }
else if(bitmap_large.GetScaledSize() != bitmap_size_large) else if(bitmap_large.GetScaledSize() != bitmap_size_large)
{ {
m_bitmap_large = MakeResizedBitmap(m_bitmap_large, bitmap_large = MakeResizedBitmap(bitmap_large, bitmap_size_large);
bitmap_size_large);
} }
m_bitmap_small = bitmap_small; if(!bitmap_small.IsOk())
if(!m_bitmap_small.IsOk())
{ {
m_bitmap_small = MakeResizedBitmap(m_bitmap_large, bitmap_small = MakeResizedBitmap(bitmap_large, bitmap_size_small);
bitmap_size_small);
} }
else if(m_bitmap_small.GetScaledSize() != bitmap_size_small) else if(bitmap_small.GetScaledSize() != bitmap_size_small)
{ {
m_bitmap_small = MakeResizedBitmap(m_bitmap_small, bitmap_small = MakeResizedBitmap(bitmap_small, bitmap_size_small);
bitmap_size_small);
}
m_bitmap_large_disabled = bitmap_large_disabled;
if(!m_bitmap_large_disabled.IsOk())
{
m_bitmap_large_disabled = MakeDisabledBitmap(m_bitmap_large);
}
m_bitmap_small_disabled = bitmap_small_disabled;
if(!m_bitmap_small_disabled.IsOk())
{
m_bitmap_small_disabled = MakeDisabledBitmap(m_bitmap_small);
} }
if ( ribbon ) if(!bitmap_large_disabled.IsOk())
{ {
if ( m_bitmap_large.IsOk() ) bitmap_large_disabled = MakeDisabledBitmap(bitmap_large);
{ }
wxImageList* const
buttonImageList = ribbon->GetButtonImageList(bitmap_size_large);
barButtonImageListPos = buttonImageList->Add(m_bitmap_large); if(!bitmap_small_disabled.IsOk())
m_bitmap_large = wxNullBitmap; {
buttonImageList->Add(m_bitmap_large_disabled); bitmap_small_disabled = MakeDisabledBitmap(bitmap_small);
m_bitmap_large_disabled = wxNullBitmap; }
}
if ( bitmap_large.IsOk() )
{
wxImageList* const wxImageList* const
buttonSmallImageList = ribbon->GetButtonImageList(bitmap_size_small); buttonImageList = ribbon->GetButtonImageList(bitmap_size_large);
barButtonSmallImageListPos = buttonSmallImageList->Add(m_bitmap_small); barButtonImageListPos = buttonImageList->Add(bitmap_large);
m_bitmap_small = wxNullBitmap; buttonImageList->Add(bitmap_large_disabled);
buttonSmallImageList->Add(m_bitmap_small_disabled);
m_bitmap_small_disabled = wxNullBitmap;
} }
wxImageList* const
buttonSmallImageList = ribbon->GetButtonImageList(bitmap_size_small);
barButtonSmallImageListPos = buttonSmallImageList->Add(bitmap_small);
buttonSmallImageList->Add(bitmap_small_disabled);
} }
void GetBitmaps(wxRibbonBar* ribbon, void GetBitmaps(wxRibbonBar* ribbon,
@@ -166,37 +153,21 @@ public:
wxBitmap& bitmap, wxBitmap& bitmap,
wxBitmap& bitmap_small) const wxBitmap& bitmap_small) const
{ {
if ( barButtonImageListPos != -1 && ribbon ) wxImageList* buttonImageList = ribbon->GetButtonImageList(bitmap_size_large);
wxImageList* buttonSmallImageList = ribbon->GetButtonImageList(bitmap_size_small);
int pos = barButtonImageListPos;
int pos_small = barButtonSmallImageListPos;
if (state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED)
{ {
wxImageList* buttonImageList = ribbon->GetButtonImageList(bitmap_size_large); // Disabled buttons are stored after the normal ones.
wxImageList* buttonSmallImageList = ribbon->GetButtonImageList(bitmap_size_small); pos++;
pos_small++;
int pos = barButtonImageListPos;
int pos_small = barButtonSmallImageListPos;
if (state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED)
{
// Disabled buttons are stored after the normal ones.
pos++;
pos_small++;
}
bitmap = buttonImageList->GetBitmap(pos);
bitmap_small = buttonSmallImageList->GetBitmap(pos_small);
}
else
{
if(state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED)
{
bitmap = m_bitmap_large_disabled;
bitmap_small = m_bitmap_small_disabled;
}
else
{
bitmap = m_bitmap_large;
bitmap_small = m_bitmap_small;
}
} }
bitmap = buttonImageList->GetBitmap(pos);
bitmap_small = buttonSmallImageList->GetBitmap(pos_small);
} }
wxRibbonButtonBarButtonInstance NewInstance() wxRibbonButtonBarButtonInstance NewInstance()
@@ -255,10 +226,6 @@ public:
wxString label; wxString label;
wxString help_string; wxString help_string;
wxBitmap m_bitmap_large;
wxBitmap m_bitmap_large_disabled;
wxBitmap m_bitmap_small;
wxBitmap m_bitmap_small_disabled;
wxCoord text_min_width[3]; wxCoord text_min_width[3];
// Index of the bitmap in the wxRibbonBar normal image list. Notice that // Index of the bitmap in the wxRibbonBar normal image list. Notice that