Mirrors/gBar
1
0
Fork 0
mirror of https://github.com/scorpion-26/gBar.git synced 2024-11-22 03:02:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add confirmation to power PowerWidget

Browse source 
For it to actually do something, we need to click twice within 2s. The
clicked button also changes color for visual indication on what was
pressed

See https://github.com/scorpion-26/gBar/issues/17
This commit is contained in:
scorpion-26 2023-05-23 22:38:19 +02:00
parent 41f6dde6ec
commit 77924b5097
3 changed files with 86 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
css/style.css
View file

@ -46,6 +46,10 @@
margin-right: 6px; margin-right: 6px;
} }
.system-confirm {
color: #50fa7b;
}
trough { trough {
border-radius: 3px; border-radius: 3px;
border-width: 1px; border-width: 1px;

4
css/style.scss
View file

@ -80,6 +80,10 @@ $textsize: 16px;
margin-right: 6px; margin-right: 6px;
} }
.system-confirm {
color: $green;
}
// Common slider settings // Common slider settings
trough { trough {
border-radius: 3px; border-radius: 3px;

88
src/Bar.cpp
View file

@ -505,6 +505,34 @@ namespace Bar
void WidgetPower(Widget& parent) void WidgetPower(Widget& parent)
{ {
// TODO: Abstract this (Currently not DRY)
static bool activatedExit = false;
static bool activatedLock = false;
static bool activatedSuspend = false;
static bool activatedReboot = false;
static bool activatedShutdown = false;
auto setActivate = [](Button& button, bool& activeBool, bool activate)
{
if (activate)
{
button.AddClass("system-confirm");
button.AddTimer<Button>(
[&](Button& button)
{
button.RemoveClass("system-confirm");
activeBool = false;
return TimerResult::Delete;
},
2000, TimerDispatchBehaviour::LateDispatch);
}
else
{
button.RemoveClass("system-confirm");
}
activeBool = activate;
};
auto eventBox = Widget::Create<EventBox>(); auto eventBox = Widget::Create<EventBox>();
eventBox->SetHoverFn(DynCtx::PowerBoxEvent); eventBox->SetHoverFn(DynCtx::PowerBoxEvent);
{ {
@ -525,36 +553,68 @@ namespace Bar
exitButton->SetClass("exit-button"); exitButton->SetClass("exit-button");
exitButton->SetText("󰗼"); exitButton->SetText("󰗼");
exitButton->OnClick( exitButton->OnClick(
[](Button&) [setActivate](Button& but)
{ {
System::ExitWM(); if (activatedExit)
{
System::ExitWM();
setActivate(but, activatedExit, false);
}
else
{
setActivate(but, activatedExit, true);
}
}); });
auto lockButton = Widget::Create<Button>(); auto lockButton = Widget::Create<Button>();
lockButton->SetClass("sleep-button"); lockButton->SetClass("sleep-button");
lockButton->SetText(""); lockButton->SetText("");
lockButton->OnClick( lockButton->OnClick(
[](Button&) [setActivate](Button& but)
{ {
System::Lock(); if (activatedLock)
{
System::Lock();
setActivate(but, activatedLock, false);
}
else
{
setActivate(but, activatedLock, true);
}
}); });
auto sleepButton = Widget::Create<Button>(); auto sleepButton = Widget::Create<Button>();
sleepButton->SetClass("sleep-button"); sleepButton->SetClass("sleep-button");
sleepButton->SetText("󰏤"); sleepButton->SetText("󰏤");
sleepButton->OnClick( sleepButton->OnClick(
[](Button&) [setActivate](Button& but)
{ {
System::Suspend(); if (activatedSuspend)
{
System::Suspend();
setActivate(but, activatedSuspend, false);
}
else
{
setActivate(but, activatedSuspend, true);
}
}); });
auto rebootButton = Widget::Create<Button>(); auto rebootButton = Widget::Create<Button>();
rebootButton->SetClass("reboot-button"); rebootButton->SetClass("reboot-button");
rebootButton->SetText("󰑐"); rebootButton->SetText("󰑐");
rebootButton->OnClick( rebootButton->OnClick(
[](Button&) [setActivate](Button& but)
{ {
System::Reboot(); if (activatedReboot)
{
System::Reboot();
setActivate(but, activatedReboot, false);
}
else
{
setActivate(but, activatedReboot, true);
}
}); });
powerBoxExpand->AddChild(std::move(exitButton)); powerBoxExpand->AddChild(std::move(exitButton));
@ -571,9 +631,17 @@ namespace Bar
powerButton->SetText(""); powerButton->SetText("");
powerButton->SetHorizontalTransform({24, true, Alignment::Fill}); powerButton->SetHorizontalTransform({24, true, Alignment::Fill});
powerButton->OnClick( powerButton->OnClick(
[](Button&) [setActivate](Button& but)
{ {
System::Shutdown(); if (activatedShutdown)
{
System::Shutdown();
setActivate(but, activatedShutdown, false);
}
else
{
setActivate(but, activatedShutdown, true);
}
}); });
powerBox->AddChild(std::move(revealer)); powerBox->AddChild(std::move(revealer));