mirror of
https://github.com/scorpion-26/gBar.git
synced 2024-11-22 03:02:49 +00:00
Initial impl for audio revealer
System events are now propagated to the slider. Problems: Rest of the revealers don't work...
This commit is contained in:
parent
4373ab7654
commit
7f867aa0fb
5 changed files with 75 additions and 13 deletions
|
@ -31,3 +31,6 @@ DefaultWorkspaceSymbol:
|
||||||
# Forces the time to be centered.
|
# Forces the time to be centered.
|
||||||
# This can cause issues, if there is not enough space on screen (e.g. when opening the text)
|
# This can cause issues, if there is not enough space on screen (e.g. when opening the text)
|
||||||
CenterTime: true
|
CenterTime: true
|
||||||
|
|
||||||
|
# Sets the audio slider to be on reveal(Just like the sensors). Only affects the bar.
|
||||||
|
AudioRevealer: true
|
||||||
|
|
66
src/Bar.cpp
66
src/Bar.cpp
|
@ -221,15 +221,8 @@ namespace Bar
|
||||||
|
|
||||||
void WidgetAudio(Widget& parent)
|
void WidgetAudio(Widget& parent)
|
||||||
{
|
{
|
||||||
auto box = Widget::Create<Box>();
|
auto widgetAudioSlider = [](Widget& parent)
|
||||||
box->SetSpacing({8, false});
|
|
||||||
box->SetHorizontalTransform({-1, false, Alignment::Right});
|
|
||||||
{
|
{
|
||||||
auto icon = Widget::Create<Text>();
|
|
||||||
icon->SetClass("audio-icon");
|
|
||||||
icon->SetText("墳");
|
|
||||||
DynCtx::audioIcon = icon.get();
|
|
||||||
|
|
||||||
auto slider = Widget::Create<Slider>();
|
auto slider = Widget::Create<Slider>();
|
||||||
slider->SetOrientation(Orientation::Horizontal);
|
slider->SetOrientation(Orientation::Horizontal);
|
||||||
slider->SetHorizontalTransform({100, true, Alignment::Fill});
|
slider->SetHorizontalTransform({100, true, Alignment::Fill});
|
||||||
|
@ -239,11 +232,60 @@ namespace Bar
|
||||||
slider->OnValueChange(DynCtx::OnChangeVolume);
|
slider->OnValueChange(DynCtx::OnChangeVolume);
|
||||||
slider->SetRange({0, 1, 0.01});
|
slider->SetRange({0, 1, 0.01});
|
||||||
|
|
||||||
box->AddChild(std::move(slider));
|
parent.AddChild(std::move(slider));
|
||||||
box->AddChild(std::move(icon));
|
};
|
||||||
}
|
|
||||||
|
|
||||||
parent.AddChild(std::move(box));
|
auto widgetAudioBody = [&widgetAudioSlider](Widget& parent)
|
||||||
|
{
|
||||||
|
auto box = Widget::Create<Box>();
|
||||||
|
box->SetSpacing({8, false});
|
||||||
|
box->SetHorizontalTransform({-1, true, Alignment::Right});
|
||||||
|
{
|
||||||
|
auto icon = Widget::Create<Text>();
|
||||||
|
icon->SetClass("audio-icon");
|
||||||
|
icon->SetText("墳");
|
||||||
|
DynCtx::audioIcon = icon.get();
|
||||||
|
|
||||||
|
if (Config::Get().audioRevealer)
|
||||||
|
{
|
||||||
|
EventBox& eventBox = (EventBox&)parent;
|
||||||
|
auto revealer = Widget::Create<Revealer>();
|
||||||
|
revealer->SetTransition({TransitionType::SlideLeft, 500});
|
||||||
|
// Add event to eventbox for the revealer to open
|
||||||
|
eventBox.SetEventFn(
|
||||||
|
[slideRevealer = revealer.get()](EventBox&, bool hovered)
|
||||||
|
{
|
||||||
|
slideRevealer->SetRevealed(hovered);
|
||||||
|
});
|
||||||
|
{
|
||||||
|
widgetAudioSlider(*revealer);
|
||||||
|
}
|
||||||
|
|
||||||
|
box->AddChild(std::move(revealer));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Straight forward
|
||||||
|
widgetAudioSlider(*box);
|
||||||
|
}
|
||||||
|
|
||||||
|
box->AddChild(std::move(icon));
|
||||||
|
}
|
||||||
|
parent.AddChild(std::move(box));
|
||||||
|
};
|
||||||
|
|
||||||
|
if (Config::Get().audioRevealer)
|
||||||
|
{
|
||||||
|
// Need an EventBox
|
||||||
|
auto eventBox = Widget::Create<EventBox>();
|
||||||
|
widgetAudioBody(*eventBox);
|
||||||
|
parent.AddChild(std::move(eventBox));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Just invoke it.
|
||||||
|
widgetAudioBody(parent);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef WITH_BLUEZ
|
#ifdef WITH_BLUEZ
|
||||||
|
|
|
@ -123,7 +123,6 @@ void Config::Load()
|
||||||
AddConfigVar("LockCommand", config.lockCommand, lineView, foundProperty);
|
AddConfigVar("LockCommand", config.lockCommand, lineView, foundProperty);
|
||||||
AddConfigVar("ExitCommand", config.exitCommand, lineView, foundProperty);
|
AddConfigVar("ExitCommand", config.exitCommand, lineView, foundProperty);
|
||||||
AddConfigVar("BatteryFolder", config.batteryFolder, lineView, foundProperty);
|
AddConfigVar("BatteryFolder", config.batteryFolder, lineView, foundProperty);
|
||||||
AddConfigVar("CenterTime", config.centerTime, lineView, foundProperty);
|
|
||||||
AddConfigVar("DefaultWorkspaceSymbol", config.defaultWorkspaceSymbol, lineView, foundProperty);
|
AddConfigVar("DefaultWorkspaceSymbol", config.defaultWorkspaceSymbol, lineView, foundProperty);
|
||||||
for (int i = 1; i < 10; i++)
|
for (int i = 1; i < 10; i++)
|
||||||
{
|
{
|
||||||
|
@ -131,6 +130,9 @@ void Config::Load()
|
||||||
AddConfigVar("WorkspaceSymbol-" + std::to_string(i), config.workspaceSymbols[i - 1], lineView, foundProperty);
|
AddConfigVar("WorkspaceSymbol-" + std::to_string(i), config.workspaceSymbols[i - 1], lineView, foundProperty);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AddConfigVar("CenterTime", config.centerTime, lineView, foundProperty);
|
||||||
|
AddConfigVar("AudioRevealer", config.audioRevealer, lineView, foundProperty);
|
||||||
|
|
||||||
if (foundProperty == false)
|
if (foundProperty == false)
|
||||||
{
|
{
|
||||||
LOG("Warning: unknown config var: " << line);
|
LOG("Warning: unknown config var: " << line);
|
||||||
|
|
|
@ -14,6 +14,7 @@ public:
|
||||||
std::string defaultWorkspaceSymbol = "";
|
std::string defaultWorkspaceSymbol = "";
|
||||||
|
|
||||||
bool centerTime = true;
|
bool centerTime = true;
|
||||||
|
bool audioRevealer = false;
|
||||||
|
|
||||||
static void Load();
|
static void Load();
|
||||||
static const Config& Get();
|
static const Config& Get();
|
||||||
|
|
|
@ -189,6 +189,8 @@ void EventBox::SetEventFn(std::function<void(EventBox&, bool)>&& fn)
|
||||||
void EventBox::Create()
|
void EventBox::Create()
|
||||||
{
|
{
|
||||||
m_Widget = gtk_event_box_new();
|
m_Widget = gtk_event_box_new();
|
||||||
|
gtk_event_box_set_above_child((GtkEventBox*)m_Widget, false);
|
||||||
|
gtk_event_box_set_visible_window((GtkEventBox*)m_Widget, false);
|
||||||
auto enter = [](GtkWidget*, GdkEventCrossing*, gpointer data) -> gboolean
|
auto enter = [](GtkWidget*, GdkEventCrossing*, gpointer data) -> gboolean
|
||||||
{
|
{
|
||||||
EventBox* box = (EventBox*)data;
|
EventBox* box = (EventBox*)data;
|
||||||
|
@ -386,5 +388,17 @@ void Slider::Create()
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
g_signal_connect(m_Widget, "change-value", G_CALLBACK(+changedFn), this);
|
g_signal_connect(m_Widget, "change-value", G_CALLBACK(+changedFn), this);
|
||||||
|
|
||||||
|
// Propagate events to any parent eventboxes
|
||||||
|
auto propagate = [](GtkWidget* widget, GdkEventCrossing* data, gpointer) -> gboolean
|
||||||
|
{
|
||||||
|
// Seems to be necessary.
|
||||||
|
gtk_propagate_event(gtk_widget_get_parent(widget), (GdkEvent*)data);
|
||||||
|
// Seems not to be necessary
|
||||||
|
return GDK_EVENT_PROPAGATE;
|
||||||
|
};
|
||||||
|
gtk_widget_set_events(m_Widget, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
|
||||||
|
g_signal_connect(m_Widget, "enter-notify-event", G_CALLBACK(+propagate), this);
|
||||||
|
g_signal_connect(m_Widget, "leave-notify-event", G_CALLBACK(+propagate), this);
|
||||||
ApplyPropertiesToWidget();
|
ApplyPropertiesToWidget();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue