mirror of
https://github.com/rad4day/Waybar.git
synced 2023-12-21 10:22:59 +01:00
feat(Tray): handle click
This commit is contained in:
parent
56e55fa4aa
commit
091b460d03
@ -33,10 +33,14 @@ class Item {
|
|||||||
private:
|
private:
|
||||||
static void proxyReady(GObject* obj, GAsyncResult* res, gpointer data);
|
static void proxyReady(GObject* obj, GAsyncResult* res, gpointer data);
|
||||||
static void getAll(GObject* obj, GAsyncResult* res, gpointer data);
|
static void getAll(GObject* obj, GAsyncResult* res, gpointer data);
|
||||||
|
static void handleActivate(GObject*, GAsyncResult*, gpointer);
|
||||||
|
static void handleSecondaryActivate(GObject*, GAsyncResult*, gpointer);
|
||||||
|
|
||||||
void updateImage();
|
void updateImage();
|
||||||
Glib::RefPtr<Gdk::Pixbuf> extractPixBuf(GVariant* variant);
|
Glib::RefPtr<Gdk::Pixbuf> extractPixBuf(GVariant* variant);
|
||||||
Glib::RefPtr<Gdk::Pixbuf> getIconByName(std::string name, int size);
|
Glib::RefPtr<Gdk::Pixbuf> getIconByName(std::string name, int size);
|
||||||
|
bool handleClick(GdkEventButton* const& /*ev*/);
|
||||||
|
|
||||||
Glib::Dispatcher* dp_;
|
Glib::Dispatcher* dp_;
|
||||||
GCancellable* cancellable_ = nullptr;
|
GCancellable* cancellable_ = nullptr;
|
||||||
SnOrgKdeStatusNotifierItem* proxy_ = nullptr;
|
SnOrgKdeStatusNotifierItem* proxy_ = nullptr;
|
||||||
|
@ -9,6 +9,9 @@ waybar::modules::SNI::Item::Item(std::string bn, std::string op,
|
|||||||
image(Gtk::manage(new Gtk::Image())), dp_(dp)
|
image(Gtk::manage(new Gtk::Image())), dp_(dp)
|
||||||
{
|
{
|
||||||
event_box.add(*image);
|
event_box.add(*image);
|
||||||
|
event_box.add_events(Gdk::BUTTON_PRESS_MASK);
|
||||||
|
event_box.signal_button_press_event()
|
||||||
|
.connect(sigc::mem_fun(*this, &Item::handleClick));
|
||||||
cancellable_ = g_cancellable_new();
|
cancellable_ = g_cancellable_new();
|
||||||
sn_org_kde_status_notifier_item_proxy_new_for_bus(G_BUS_TYPE_SESSION,
|
sn_org_kde_status_notifier_item_proxy_new_for_bus(G_BUS_TYPE_SESSION,
|
||||||
G_DBUS_PROXY_FLAGS_NONE, bus_name.c_str(), object_path.c_str(),
|
G_DBUS_PROXY_FLAGS_NONE, bus_name.c_str(), object_path.c_str(),
|
||||||
@ -70,7 +73,7 @@ void waybar::modules::SNI::Item::getAll(GObject* obj, GAsyncResult* res,
|
|||||||
} else if (g_strcmp0(key, "Status") == 0) {
|
} else if (g_strcmp0(key, "Status") == 0) {
|
||||||
item->status = g_variant_dup_string(value, nullptr);
|
item->status = g_variant_dup_string(value, nullptr);
|
||||||
} else if (g_strcmp0(key, "WindowId") == 0) {
|
} else if (g_strcmp0(key, "WindowId") == 0) {
|
||||||
item->window_id = g_variant_get_int32 (value);
|
item->window_id = g_variant_get_int32(value);
|
||||||
} else if (g_strcmp0(key, "IconName") == 0) {
|
} else if (g_strcmp0(key, "IconName") == 0) {
|
||||||
item->icon_name = g_variant_dup_string(value, nullptr);
|
item->icon_name = g_variant_dup_string(value, nullptr);
|
||||||
} else if (g_strcmp0(key, "IconPixmap") == 0) {
|
} else if (g_strcmp0(key, "IconPixmap") == 0) {
|
||||||
@ -210,3 +213,33 @@ Glib::RefPtr<Gdk::Pixbuf> waybar::modules::SNI::Item::getIconByName(
|
|||||||
return icon_theme->load_icon(name.c_str(), icon_size,
|
return icon_theme->load_icon(name.c_str(), icon_size,
|
||||||
Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE);
|
Gtk::IconLookupFlags::ICON_LOOKUP_FORCE_SIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void waybar::modules::SNI::Item::handleActivate(GObject* src, GAsyncResult* res,
|
||||||
|
gpointer data)
|
||||||
|
{
|
||||||
|
auto item = static_cast<SNI::Item *>(data);
|
||||||
|
sn_org_kde_status_notifier_item_call_activate_finish(item->proxy_, res,
|
||||||
|
nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void waybar::modules::SNI::Item::handleSecondaryActivate(GObject* src,
|
||||||
|
GAsyncResult* res, gpointer data)
|
||||||
|
{
|
||||||
|
auto item = static_cast<SNI::Item *>(data);
|
||||||
|
sn_org_kde_status_notifier_item_call_secondary_activate_finish(item->proxy_,
|
||||||
|
res, nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool waybar::modules::SNI::Item::handleClick(GdkEventButton* const& ev)
|
||||||
|
{
|
||||||
|
if (ev->type == GDK_BUTTON_PRESS) {
|
||||||
|
sn_org_kde_status_notifier_item_call_activate(proxy_, ev->x, ev->y, nullptr,
|
||||||
|
&Item::handleActivate, this);
|
||||||
|
} else if (ev->type == GDK_2BUTTON_PRESS) {
|
||||||
|
sn_org_kde_status_notifier_item_call_secondary_activate(proxy_, ev->x,
|
||||||
|
ev->y, nullptr, &Item::handleSecondaryActivate, this);
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user