AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add new api for appending a separator to the thumbnail toolbar.

Browse Source 
Actually, when calling AppendSeparator we are appending a disable
ThumbBarButton without background, which can simulate the behavior
of appending a separator.

Author: Chaobin Zhang

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty 2014-09-10 14:52:55 +00:00
parent 4c08974648
commit dd06fa3aa8
5 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/msw/taskbarbutton.h
View File

@ -35,6 +35,7 @@ public:
virtual bool InsertThumbBarButton(size_t pos,
wxThumbBarButton *button) wxOVERRIDE;
virtual bool AppendThumbBarButton(wxThumbBarButton *button) wxOVERRIDE;
virtual bool AppendSeparatorInThumbBar() wxOVERRIDE;
virtual wxThumbBarButton* RemoveThumbBarButton(
wxThumbBarButton *button) wxOVERRIDE;
virtual wxThumbBarButton* RemoveThumbBarButton(int id) wxOVERRIDE;

1
include/wx/taskbarbutton.h
View File

@ -116,6 +116,7 @@ public:
virtual void SetThumbnailContents(const wxWindow *child) = 0;
virtual bool InsertThumbBarButton(size_t pos, wxThumbBarButton *button) = 0;
virtual bool AppendThumbBarButton(wxThumbBarButton *button) = 0;
virtual bool AppendSeparatorInThumbBar() = 0;
virtual wxThumbBarButton* RemoveThumbBarButton(wxThumbBarButton *button) = 0;
virtual wxThumbBarButton* RemoveThumbBarButton(int id) = 0;

19
interface/wx/taskbarbutton.h
View File

@ -279,21 +279,30 @@ public:
Inserts the given button before the position pos to the taskbar
thumbnail toolbar.
@note The number of buttons is limited to 7.
@note The number of buttons and separators is limited to 7.
@see AppendThumbBarButton()
@see AppendThumbBarButton(), AppendSeparatorInThumbBar()
*/
virtual bool InsertThumbBarButton(size_t pos, wxThumbBarButton *button);
/**
Adds a button to the taskbar thumbnail toolbar.
Appends a button to the taskbar thumbnail toolbar.
@note The number of buttons is limited to 7.
@note The number of buttons and separators is limited to 7.
@see InsertThumbBarButton()
@see InsertThumbBarButton(), AppendSeparatorInThumbBar()
*/
virtual bool AppendThumbBarButton(wxThumbBarButton *button);
/**
Appends a separator to the taskbar thumbnail toolbar.
@note The number of buttons and separators is limited to 7.
@see AppendThumbBarButton(), InsertThumbBarButton()
*/
virtual bool AppendSeparatorInThumbBar();
/**
Removes the thumbnail toolbar button from the taskbar button but doesn't
delete the associated c++ object.

3
samples/taskbarbutton/taskbarbutton.cpp
View File

@ -346,13 +346,12 @@ void MyFrame::OnSetOrRestoreThumbnailClip(wxCommandEvent& event)
MSWGetTaskBarButton()->SetThumbnailClip(rect);
}
void MyFrame::OnAddThubmBarButton(wxCommandEvent& WXUNUSED(event))
{
if ( m_thumbBarButtons.size() >= 7 )
return;
wxThumbBarButton* button =
wxThumbBarButton *button =
new wxThumbBarButton(m_thumbBarButtons.size() + ThumbnailToolbarBtn_0 ,
CreateRandomIcon());
MSWGetTaskBarButton()->AppendThumbBarButton(button);

21
src/msw/taskbarbutton.cpp
View File

@ -253,18 +253,35 @@ void wxTaskBarButtonImpl::SetThumbnailContents(const wxWindow *child)
bool wxTaskBarButtonImpl::AppendThumbBarButton(wxThumbBarButton *button)
{
wxASSERT_MSG( m_thumbBarButtons.size() < MAX_BUTTON_COUNT,
"Number of thumb buttons is limited to 7" );
"Number of ThumbBarButtons and separators is limited to 7" );
button->SetParent(this);
m_thumbBarButtons.push_back(button);
return InitOrUpdateThumbBarButtons();
}
bool wxTaskBarButtonImpl::AppendSeparatorInThumbBar()
{
wxASSERT_MSG( m_thumbBarButtons.size() < MAX_BUTTON_COUNT,
"Number of ThumbBarButtons and separators is limited to 7" );
// Append a disable ThumbBarButton without background can simulate the
// behavior of appending a separator.
wxThumbBarButton *separator = new wxThumbBarButton(wxID_ANY,
wxNullIcon,
wxEmptyString,
false,
false,
false);
m_thumbBarButtons.push_back(separator);
return InitOrUpdateThumbBarButtons();
}
bool wxTaskBarButtonImpl::InsertThumbBarButton(size_t pos,
wxThumbBarButton *button)
{
wxASSERT_MSG( m_thumbBarButtons.size() < MAX_BUTTON_COUNT,
"Number of thumb buttons is limited to 7" );
"Number of ThumbBarButtons and separators is limited to 7" );
wxASSERT_MSG( pos <= m_thumbBarButtons.size(),
"Invalid index when inserting the button" );