summaryrefslogtreecommitdiff
path: root/src/windows
diff options
context:
space:
mode:
authorouwou <26526779+ouwou@users.noreply.github.com>2022-09-27 00:36:11 -0400
committerouwou <26526779+ouwou@users.noreply.github.com>2022-09-27 00:36:11 -0400
commit0571a05497ff628ceba8c7752dc3dd4104b1e0ea (patch)
tree0f145ca323b88dc6300a6a2077312d57beef4697 /src/windows
parent90437de2c031f6cf0b58603d9cb5582064176374 (diff)
parent3027e00905b19282a4f501a26f7a4f71bc6940ea (diff)
downloadabaddon-portaudio-0571a05497ff628ceba8c7752dc3dd4104b1e0ea.tar.gz
abaddon-portaudio-0571a05497ff628ceba8c7752dc3dd4104b1e0ea.zip
Merge branch 'master' into voice
Diffstat (limited to 'src/windows')
-rw-r--r--src/windows/guildsettings/infopane.cpp7
-rw-r--r--src/windows/mainwindow.cpp2
-rw-r--r--src/windows/mainwindow.hpp1
-rw-r--r--src/windows/profile/userinfopane.cpp4
-rw-r--r--src/windows/profilewindow.cpp4
5 files changed, 9 insertions, 9 deletions
diff --git a/src/windows/guildsettings/infopane.cpp b/src/windows/guildsettings/infopane.cpp
index 578aaac..a27c1a8 100644
--- a/src/windows/guildsettings/infopane.cpp
+++ b/src/windows/guildsettings/infopane.cpp
@@ -56,10 +56,9 @@ GuildSettingsInfoPane::GuildSettingsInfoPane(Snowflake id)
guild_icon_url = guild.GetIconURL("gif", "512");
else
guild_icon_url = guild.GetIconURL("png", "512");
- m_guild_icon_ev.signal_button_press_event().connect([guild_icon_url](GdkEventButton *event) -> bool {
- if (event->type == GDK_BUTTON_PRESS)
- if (event->button == GDK_BUTTON_PRIMARY)
- LaunchBrowser(guild_icon_url);
+ m_guild_icon_ev.signal_button_release_event().connect([guild_icon_url](GdkEventButton *event) -> bool {
+ if (event->type == GDK_BUTTON_RELEASE && event->button == GDK_BUTTON_PRIMARY)
+ LaunchBrowser(guild_icon_url);
return false;
});
diff --git a/src/windows/mainwindow.cpp b/src/windows/mainwindow.cpp
index 17edfa3..7f4395c 100644
--- a/src/windows/mainwindow.cpp
+++ b/src/windows/mainwindow.cpp
@@ -401,4 +401,4 @@ MainWindow::type_signal_action_view_pins MainWindow::signal_action_view_pins() {
MainWindow::type_signal_action_view_threads MainWindow::signal_action_view_threads() {
return m_signal_action_view_threads;
-}
+} \ No newline at end of file
diff --git a/src/windows/mainwindow.hpp b/src/windows/mainwindow.hpp
index b5b6fc1..534df1b 100644
--- a/src/windows/mainwindow.hpp
+++ b/src/windows/mainwindow.hpp
@@ -83,6 +83,7 @@ private:
Gtk::MenuItem m_menu_view_go_back;
Gtk::MenuItem m_menu_view_go_forward;
#endif
+
void OnViewSubmenuPopup();
public:
diff --git a/src/windows/profile/userinfopane.cpp b/src/windows/profile/userinfopane.cpp
index a17dbff..b62da93 100644
--- a/src/windows/profile/userinfopane.cpp
+++ b/src/windows/profile/userinfopane.cpp
@@ -41,13 +41,13 @@ ConnectionItem::ConnectionItem(const ConnectionData &conn)
m_box.add(m_name);
if (!url.empty()) {
auto cb = [url](GdkEventButton *event) -> bool {
- if (event->type == GDK_BUTTON_PRESS && event->button == GDK_BUTTON_PRIMARY) {
+ if (event->type == GDK_BUTTON_RELEASE && event->button == GDK_BUTTON_PRIMARY) {
LaunchBrowser(url);
return true;
}
return false;
};
- signal_button_press_event().connect(sigc::track_obj(cb, *this));
+ signal_button_release_event().connect(sigc::track_obj(cb, *this));
AddPointerCursor(*this);
}
m_overlay.add(m_box);
diff --git a/src/windows/profilewindow.cpp b/src/windows/profilewindow.cpp
index aff98c5..d73731d 100644
--- a/src/windows/profilewindow.cpp
+++ b/src/windows/profilewindow.cpp
@@ -34,8 +34,8 @@ ProfileWindow::ProfileWindow(Snowflake user_id)
if (user.HasAvatar())
AddPointerCursor(m_avatar_ev);
- m_avatar_ev.signal_button_press_event().connect([user](GdkEventButton *event) -> bool {
- if (event->type == GDK_BUTTON_PRESS && event->button == GDK_BUTTON_PRIMARY) {
+ m_avatar_ev.signal_button_release_event().connect([user](GdkEventButton *event) -> bool {
+ if (event->type == GDK_BUTTON_RELEASE && event->button == GDK_BUTTON_PRIMARY) {
if (user.HasAnimatedAvatar())
LaunchBrowser(user.GetAvatarURL("gif", "512"));
else