mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #6829 from electron/fix-thumbar-buttons-vanishing

Browse source 
Save the thumbar buttons when setting them to restore later
This commit is contained in:
Cheng Zhao 2016-08-18 14:34:26 +09:00 committed by GitHub
commit 56d17a1449
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_window.cc
View file

@ -606,7 +606,7 @@ bool Window::SetThumbarButtons(mate::Arguments* args) {
}
auto window = static_cast<NativeWindowViews*>(window_.get());
return window->taskbar_host().SetThumbarButtons(
window->GetAcceleratedWidget(), buttons);
window_->GetAcceleratedWidget(), buttons);
#else
return false;
#endif

6
atom/browser/native_window_views.cc
View file

@ -726,10 +726,12 @@ void NativeWindowViews::SetSkipTaskbar(bool skip) {
CLSCTX_INPROC_SERVER)) ||
FAILED(taskbar->HrInit()))
return;
if (skip)
if (skip) {
taskbar->DeleteTab(GetAcceleratedWidget());
else
} else {
taskbar->AddTab(GetAcceleratedWidget());
taskbar_host_.RestoreThumbarButtons(GetAcceleratedWidget());
}
#elif defined(USE_X11)
SetWMSpecState(GetAcceleratedWidget(), skip,
GetAtom("_NET_WM_STATE_SKIP_TASKBAR"));

8
atom/browser/ui/win/taskbar_host.cc
View file

@ -115,9 +115,17 @@ bool TaskbarHost::SetThumbarButtons(
r = taskbar_->ThumbBarAddButtons(window, kMaxButtonsCount, thumb_buttons);
thumbar_buttons_added_ = true;
last_buttons_ = buttons;
return SUCCEEDED(r);
}
void TaskbarHost::RestoreThumbarButtons(HWND window) {
if (thumbar_buttons_added_) {
thumbar_buttons_added_ = false;
SetThumbarButtons(window, last_buttons_);
}
}
bool TaskbarHost::SetProgressBar(
HWND window, double value, const std::string& mode) {
if (!InitializeTaskbar())

4
atom/browser/ui/win/taskbar_host.h
View file

@ -34,6 +34,8 @@ class TaskbarHost {
bool SetThumbarButtons(
HWND window, const std::vector<ThumbarButton>& buttons);
void RestoreThumbarButtons(HWND window);
// Set the progress state in taskbar.
bool SetProgressBar(HWND window, double value, const std::string& mode);
@ -57,6 +59,8 @@ class TaskbarHost {
using CallbackMap = std::map<int, base::Closure>;
CallbackMap callback_map_;
std::vector<ThumbarButton> last_buttons_;
// The COM object of taskbar.
base::win::ScopedComPtr<ITaskbarList3> taskbar_;