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

Style fixes for SetProgressBar

Browse source
This commit is contained in:
Cheng Zhao 2016-08-09 21:02:14 +09:00
parent 81244c2221
commit dd79c71302
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/native_window_views.cc
View file

@ -905,7 +905,7 @@ gfx::NativeWindow NativeWindowViews::GetNativeWindow() {
}
void NativeWindowViews::SetProgressBar(
double progress, const std::string& mode) {
double progress, const std::string& mode) {
#if defined(OS_WIN)
taskbar_host_.SetProgressBar(GetAcceleratedWidget(), progress, mode);
#elif defined(USE_X11)

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

@ -118,39 +118,35 @@ bool TaskbarHost::SetThumbarButtons(
}
bool TaskbarHost::SetProgressBar(
HWND window, double value, const std::string& mode) {
HWND window, double value, const std::string& mode) {
if (!InitializeTaskbar())
return false;
HRESULT barR;
HRESULT stateR;
bool success;
if (value > 1.0 || mode == "indeterminate") {
barR = taskbar_->SetProgressState(window, TBPF_INDETERMINATE);
success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_INDETERMINATE));
} else if (value < 0 || mode == "none") {
barR = taskbar_->SetProgressState(window, TBPF_NOPROGRESS);
success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_NOPROGRESS));
} else {
// Unless SetProgressState set a blocking state (TBPF_ERROR, TBPF_PAUSED)
// for the window, a call to SetProgressValue assumes the TBPF_NORMAL
// state even if it is not explicitly set.
// SetProgressValue overrides and clears the TBPF_INDETERMINATE state.
if (mode == "error") {
stateR = taskbar_->SetProgressState(window, TBPF_ERROR);
success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_ERROR));
} else if (mode == "paused") {
stateR = taskbar_->SetProgressState(window, TBPF_PAUSED);
success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_PAUSED));
} else {
stateR = taskbar_->SetProgressState(window, TBPF_NORMAL);
success = SUCCEEDED(taskbar_->SetProgressState(window, TBPF_NORMAL));
}
if (SUCCEEDED(stateR)) {
if (success) {
int val = static_cast<int>(value * 100);
barR = taskbar_->SetProgressValue(window, val, 100);
} else {
return SUCCEEDED(stateR);
success = SUCCEEDED(taskbar_->SetProgressValue(window, val, 100));
}
}
return SUCCEEDED(barR);
return success;
}
bool TaskbarHost::SetOverlayIcon(