celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-13 20:18:50 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

update some stuff with the guild icon in the info window

Browse Source 
- fix tooltip showing up when it shouldnt
- allow clicking on it to open icon url
- refactorino
This commit is contained in:
ouwou
2021-02-11 23:37:13 -05:00
parent bab9abf4af
commit 921a3c25f8
2 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
windows/guildsettings/infopane.cpp
View File

@@ -30,30 +30,19 @@ GuildSettingsInfoPane::GuildSettingsInfoPane(Snowflake id)
m_guild_name.show();
m_guild_name_label.show();
auto load_icon_cb = [this](const Glib::RefPtr<Gdk::Pixbuf> &pixbuf) {
m_guild_icon.property_pixbuf() = pixbuf->scale_simple(64, 64, Gdk::INTERP_BILINEAR);
};
auto guild_update_cb = [this, load_icon_cb](Snowflake id) {
auto guild_update_cb = [this](Snowflake id) {
if (id != GuildID) return;
const auto guild = *Abaddon::Get().GetDiscordClient().GetGuild(id);
if (guild.HasIcon())
Abaddon::Get().GetImageManager().LoadFromURL(guild.GetIconURL("png", "64"), sigc::track_obj(load_icon_cb, *this));
FetchGuildIcon(guild);
};
discord.signal_guild_update().connect(sigc::track_obj(guild_update_cb, *this));
FetchGuildIcon(guild);
AddPointerCursor(m_guild_icon_ev);
m_guild_icon.property_pixbuf() = Abaddon::Get().GetImageManager().GetPlaceholder(32);
if (guild.HasIcon()) {
Abaddon::Get().GetImageManager().LoadFromURL(guild.GetIconURL("png", "64"), sigc::track_obj(load_icon_cb, *this));
}
m_guild_icon.set_margin_bottom(10);
if (can_modify) {
m_guild_icon_ev.signal_realize().connect([this]() {
auto window = m_guild_icon_ev.get_window();
auto display = window->get_display();
auto cursor = Gdk::Cursor::create(display, "pointer");
window->set_cursor(cursor);
});
m_guild_icon_ev.set_tooltip_text("Click to choose a file, right click to paste");
m_guild_icon_ev.signal_button_press_event().connect([this](GdkEventButton *event) -> bool {
if (event->type == GDK_BUTTON_PRESS)
@@ -62,21 +51,47 @@ GuildSettingsInfoPane::GuildSettingsInfoPane(Snowflake id)
else if (event->button == GDK_BUTTON_SECONDARY)
UpdateGuildIconClipboard();
return false;
});
} else if (guild.HasIcon()) {
std::string guild_icon_url;
if (guild.HasAnimatedIcon())
guild_icon_url = guild.GetIconURL("gif", "512");
else
guild_icon_url = guild.GetIconURL("png", "512");
m_guild_icon_ev.signal_button_press_event().connect([this, guild_icon_url](GdkEventButton *event) -> bool {
if (event->type == GDK_BUTTON_PRESS)
if (event->button == GDK_BUTTON_PRIMARY)
LaunchBrowser(guild_icon_url);
return false;
});
}
m_guild_icon_ev.set_tooltip_text("Click to choose a file, right click to paste");
m_guild_icon.show();
m_guild_icon_ev.show();
//m_guild_icon_label.show();
m_guild_icon_ev.add(m_guild_icon);
attach(m_guild_icon_ev, 0, 0, 1, 1);
attach(m_guild_name_label, 0, 1, 1, 1);
attach_next_to(m_guild_name, m_guild_name_label, Gtk::POS_RIGHT, 1, 1);
//attach(m_guild_icon_label, 0, 1, 1, 1);
//attach_next_to(m_guild_icon, m_guild_icon_label, Gtk::POS_RIGHT, 1, 1);
}
void GuildSettingsInfoPane::FetchGuildIcon(const GuildData &guild) {
m_guild_icon.property_pixbuf() = Abaddon::Get().GetImageManager().GetPlaceholder(32);
if (guild.HasIcon()) {
if (Abaddon::Get().GetSettings().GetShowAnimations() && guild.HasAnimatedIcon()) {
auto cb = [this](const Glib::RefPtr<Gdk::PixbufAnimation> &pixbuf) {
m_guild_icon.property_pixbuf_animation() = pixbuf;
};
Abaddon::Get().GetImageManager().LoadAnimationFromURL(guild.GetIconURL("gif", "64"), 64, 64, sigc::track_obj(cb, *this));
}
auto cb = [this](const Glib::RefPtr<Gdk::Pixbuf> &pixbuf) {
m_guild_icon.property_pixbuf() = pixbuf->scale_simple(64, 64, Gdk::INTERP_BILINEAR);
};
Abaddon::Get().GetImageManager().LoadFromURL(guild.GetIconURL("png", "64"), sigc::track_obj(cb, *this));
}
}
void GuildSettingsInfoPane::UpdateGuildName() {

4
windows/guildsettings/infopane.hpp
View File

@@ -1,12 +1,14 @@
#pragma once
#include <gtkmm.h>
#include "../../discord/snowflake.hpp"
#include "../../discord/guild.hpp"
class GuildSettingsInfoPane : public Gtk::Grid {
public:
GuildSettingsInfoPane(Snowflake id);
private:
void FetchGuildIcon(const GuildData &guild);
void UpdateGuildName();
void UpdateGuildIconFromData(const std::vector<uint8_t> &data, const std::string &mime);
void UpdateGuildIconFromPixbuf(Glib::RefPtr<Gdk::Pixbuf> pixbuf);