summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/abaddon.cpp11
-rw-r--r--src/abaddon.hpp1
-rw-r--r--src/components/channelscellrenderer.cpp229
-rw-r--r--src/components/chatinput.cpp61
-rw-r--r--src/components/chatinput.hpp6
-rw-r--r--src/components/chatmessage.cpp5
-rw-r--r--src/components/chatwindow.cpp10
-rw-r--r--src/components/progressbar.cpp19
-rw-r--r--src/components/progressbar.hpp11
-rw-r--r--src/dialogs/setstatus.cpp41
-rw-r--r--src/dialogs/setstatus.hpp4
-rw-r--r--src/settings.cpp4
-rw-r--r--src/settings.hpp13
-rw-r--r--src/windows/voicesettingswindow.cpp20
-rw-r--r--src/windows/voicewindow.cpp40
15 files changed, 202 insertions, 273 deletions
diff --git a/src/abaddon.cpp b/src/abaddon.cpp
index d949c28..8b8a0b2 100644
--- a/src/abaddon.cpp
+++ b/src/abaddon.cpp
@@ -192,13 +192,6 @@ int Abaddon::StartGTK() {
dlg.run();
});
- m_css_low_provider = Gtk::CssProvider::create();
- m_css_low_provider->signal_parsing_error().connect([](const Glib::RefPtr<const Gtk::CssSection> &section, const Glib::Error &error) {
- Gtk::MessageDialog dlg("low-priority css failed parsing (" + error.what() + ")", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
- dlg.set_position(Gtk::WIN_POS_CENTER);
- dlg.run();
- });
-
#ifdef _WIN32
bool png_found = false;
bool gif_found = false;
@@ -1086,10 +1079,6 @@ void Abaddon::ActionReloadCSS() {
Gtk::StyleContext::remove_provider_for_screen(Gdk::Screen::get_default(), m_css_provider);
m_css_provider->load_from_path(GetCSSPath("/" + GetSettings().MainCSS));
Gtk::StyleContext::add_provider_for_screen(Gdk::Screen::get_default(), m_css_provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-
- Gtk::StyleContext::remove_provider_for_screen(Gdk::Screen::get_default(), m_css_low_provider);
- m_css_low_provider->load_from_path(GetCSSPath("/application-low-priority.css"));
- Gtk::StyleContext::add_provider_for_screen(Gdk::Screen::get_default(), m_css_low_provider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION - 1);
} catch (Glib::Error &e) {
Gtk::MessageDialog dlg(*m_main_window, "css failed to load (" + e.what() + ")", false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, true);
dlg.set_position(Gtk::WIN_POS_CENTER);
diff --git a/src/abaddon.hpp b/src/abaddon.hpp
index 85b2fa0..6093523 100644
--- a/src/abaddon.hpp
+++ b/src/abaddon.hpp
@@ -182,7 +182,6 @@ private:
mutable std::mutex m_mutex;
Glib::RefPtr<Gtk::Application> m_gtk_app;
Glib::RefPtr<Gtk::CssProvider> m_css_provider;
- Glib::RefPtr<Gtk::CssProvider> m_css_low_provider; // registered with a lower priority to allow better customization
Glib::RefPtr<Gtk::StatusIcon> m_tray;
std::unique_ptr<MainWindow> m_main_window; // wah wah cant create a gtkstylecontext fuck you
diff --git a/src/components/channelscellrenderer.cpp b/src/components/channelscellrenderer.cpp
index ac98512..bf84a9b 100644
--- a/src/components/channelscellrenderer.cpp
+++ b/src/components/channelscellrenderer.cpp
@@ -7,6 +7,49 @@ constexpr static double M_PI = 3.14159265358979;
constexpr static double M_PI_H = M_PI / 2.0;
constexpr static double M_PI_3_2 = M_PI * 3.0 / 2.0;
+void AddUnreadIndicator(const Cairo::RefPtr<Cairo::Context> &cr, Gtk::Widget &widget, const Gdk::Rectangle &background_area) {
+ static const auto color_setting = Gdk::RGBA(Abaddon::Get().GetSettings().UnreadIndicatorColor);
+
+ const auto color = color_setting.get_alpha_u() > 0 ? color_setting : widget.get_style_context()->get_background_color(Gtk::STATE_FLAG_SELECTED);
+
+ cr->set_source_rgb(color.get_red(), color.get_green(), color.get_blue());
+ const auto x = background_area.get_x();
+ const auto y = background_area.get_y();
+ const auto w = background_area.get_width();
+ const auto h = background_area.get_height();
+ cr->rectangle(x, y, 3, h);
+ cr->fill();
+}
+
+void RenderExpander(int x_offset, const Cairo::RefPtr<Cairo::Context> &cr, Gtk::Widget &widget, const Gdk::Rectangle &background_area, bool is_expanded) {
+ constexpr static int len = 5;
+ int x1, y1, x2, y2, x3, y3;
+ if (is_expanded) {
+ x1 = background_area.get_x() + x_offset;
+ y1 = background_area.get_y() + background_area.get_height() / 2 - len;
+ x2 = background_area.get_x() + x_offset + len;
+ y2 = background_area.get_y() + background_area.get_height() / 2 + len;
+ x3 = background_area.get_x() + x_offset + len * 2;
+ y3 = background_area.get_y() + background_area.get_height() / 2 - len;
+ } else {
+ x1 = background_area.get_x() + x_offset;
+ y1 = background_area.get_y() + background_area.get_height() / 2 - len;
+ x2 = background_area.get_x() + x_offset + len * 2;
+ y2 = background_area.get_y() + background_area.get_height() / 2;
+ x3 = background_area.get_x() + x_offset;
+ y3 = background_area.get_y() + background_area.get_height() / 2 + len;
+ }
+ cr->move_to(x1, y1);
+ cr->line_to(x2, y2);
+ cr->line_to(x3, y3);
+ auto expander_color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelsExpanderColor);
+ if (expander_color.get_alpha_u() == 0) {
+ expander_color = widget.get_style_context()->get_background_color(Gtk::STATE_FLAG_SELECTED);
+ }
+ cr->set_source_rgb(expander_color.get_red(), expander_color.get_green(), expander_color.get_blue());
+ cr->stroke();
+}
+
CellRendererChannels::CellRendererChannels()
: Glib::ObjectBase(typeid(CellRendererChannels))
, Gtk::CellRenderer()
@@ -207,30 +250,7 @@ void CellRendererChannels::get_preferred_height_for_width_vfunc_folder(Gtk::Widg
}
void CellRendererChannels::render_vfunc_folder(const Cairo::RefPtr<Cairo::Context> &cr, Gtk::Widget &widget, const Gdk::Rectangle &background_area, const Gdk::Rectangle &cell_area, Gtk::CellRendererState flags) {
- constexpr static int len = 5;
- int x1, y1, x2, y2, x3, y3;
- if (property_expanded()) {
- x1 = background_area.get_x() + 7;
- y1 = background_area.get_y() + background_area.get_height() / 2 - len;
- x2 = background_area.get_x() + 7 + len;
- y2 = background_area.get_y() + background_area.get_height() / 2 + len;
- x3 = background_area.get_x() + 7 + len * 2;
- y3 = background_area.get_y() + background_area.get_height() / 2 - len;
- } else {
- x1 = background_area.get_x() + 7;
- y1 = background_area.get_y() + background_area.get_height() / 2 - len;
- x2 = background_area.get_x() + 7 + len * 2;
- y2 = background_area.get_y() + background_area.get_height() / 2;
- x3 = background_area.get_x() + 7;
- y3 = background_area.get_y() + background_area.get_height() / 2 + len;
- }
- cr->move_to(x1, y1);
- cr->line_to(x2, y2);
- cr->line_to(x3, y3);
- const auto expander_color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelsExpanderColor);
- cr->set_source_rgb(expander_color.get_red(), expander_color.get_green(), expander_color.get_blue());
- cr->stroke();
-
+ RenderExpander(7, cr, widget, background_area, property_expanded());
Gtk::Requisition text_minimum, text_natural;
m_renderer_text.get_preferred_size(widget, text_minimum, text_natural);
@@ -241,11 +261,8 @@ void CellRendererChannels::render_vfunc_folder(const Cairo::RefPtr<Cairo::Contex
Gdk::Rectangle text_cell_area(text_x, text_y, text_w, text_h);
- static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelColor);
if (m_property_color.get_value().has_value()) {
m_renderer_text.property_foreground_rgba() = *m_property_color.get_value();
- } else {
- m_renderer_text.property_foreground_rgba() = color;
}
m_renderer_text.render(cr, widget, background_area, text_cell_area, flags);
m_renderer_text.property_foreground_set() = false;
@@ -325,8 +342,6 @@ void CellRendererChannels::render_vfunc_guild(const Cairo::RefPtr<Cairo::Context
static_cast<int>(text_w),
static_cast<int>(text_h));
- static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelColor);
- m_renderer_text.property_foreground_rgba() = color;
m_renderer_text.render(cr, widget, background_area, text_cell_area, flags);
const bool hover_only = Abaddon::Get().GetSettings().AnimatedGuildHoverOnly;
@@ -373,14 +388,9 @@ void CellRendererChannels::render_vfunc_guild(const Cairo::RefPtr<Cairo::Context
const auto has_unread = discord.GetUnreadStateForGuild(id, total_mentions);
if (has_unread && !discord.IsGuildMuted(id)) {
- static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().UnreadIndicatorColor);
- cr->set_source_rgb(color.get_red(), color.get_green(), color.get_blue());
- const auto x = background_area.get_x();
- const auto y = background_area.get_y();
- const auto w = background_area.get_width();
- const auto h = background_area.get_height();
- cr->rectangle(x, y + h / 2.0 - 24.0 / 2.0, 3.0, 24.0);
- cr->fill();
+ auto area = background_area;
+ area.set_y(area.get_y() + area.get_height() / 2.0 - 24.0 / 2.0);
+ AddUnreadIndicator(cr, widget, area);
}
if (total_mentions < 1) return;
@@ -410,42 +420,8 @@ void CellRendererChannels::get_preferred_height_for_width_vfunc_category(Gtk::Wi
m_renderer_text.get_preferred_height_for_width(widget, width, minimum_height, natural_height);
}
-void AddUnreadIndicator(const Cairo::RefPtr<Cairo::Context> &cr, const Gdk::Rectangle &background_area) {
- static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().UnreadIndicatorColor);
- cr->set_source_rgb(color.get_red(), color.get_green(), color.get_blue());
- const auto x = background_area.get_x();
- const auto y = background_area.get_y();
- const auto w = background_area.get_width();
- const auto h = background_area.get_height();
- cr->rectangle(x, y, 3, h);
- cr->fill();
-}
-
void CellRendererChannels::render_vfunc_category(const Cairo::RefPtr<Cairo::Context> &cr, Gtk::Widget &widget, const Gdk::Rectangle &background_area, const Gdk::Rectangle &cell_area, Gtk::CellRendererState flags) {
- // todo: figure out how Gtk::Arrow is rendered because i like it better :^)
- constexpr static int len = 5;
- int x1, y1, x2, y2, x3, y3;
- if (property_expanded()) {
- x1 = background_area.get_x() + 7;
- y1 = background_area.get_y() + background_area.get_height() / 2 - len;
- x2 = background_area.get_x() + 7 + len;
- y2 = background_area.get_y() + background_area.get_height() / 2 + len;
- x3 = background_area.get_x() + 7 + len * 2;
- y3 = background_area.get_y() + background_area.get_height() / 2 - len;
- } else {
- x1 = background_area.get_x() + 7;
- y1 = background_area.get_y() + background_area.get_height() / 2 - len;
- x2 = background_area.get_x() + 7 + len * 2;
- y2 = background_area.get_y() + background_area.get_height() / 2;
- x3 = background_area.get_x() + 7;
- y3 = background_area.get_y() + background_area.get_height() / 2 + len;
- }
- cr->move_to(x1, y1);
- cr->line_to(x2, y2);
- cr->line_to(x3, y3);
- const auto expander_color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelsExpanderColor);
- cr->set_source_rgb(expander_color.get_red(), expander_color.get_green(), expander_color.get_blue());
- cr->stroke();
+ RenderExpander(7, cr, widget, background_area, property_expanded());
Gtk::Requisition text_minimum, text_natural;
m_renderer_text.get_preferred_size(widget, text_minimum, text_natural);
@@ -457,23 +433,14 @@ void CellRendererChannels::render_vfunc_category(const Cairo::RefPtr<Cairo::Cont
Gdk::Rectangle text_cell_area(text_x, text_y, text_w, text_h);
- static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelColor);
auto &discord = Abaddon::Get().GetDiscordClient();
const auto id = m_property_id.get_value();
- if (discord.IsChannelMuted(m_property_id.get_value())) {
- auto muted = color;
- muted.set_red(muted.get_red() * 0.5);
- muted.set_green(muted.get_green() * 0.5);
- muted.set_blue(muted.get_blue() * 0.5);
- m_renderer_text.property_foreground_rgba() = muted;
- } else {
+ if (!discord.IsChannelMuted(m_property_id.get_value())) {
if (discord.GetUnreadChannelsCountForCategory(id) > 0) {
- AddUnreadIndicator(cr, background_area);
+ AddUnreadIndicator(cr, widget, background_area);
}
- m_renderer_text.property_foreground_rgba() = color;
}
m_renderer_text.render(cr, widget, background_area, text_cell_area, flags);
- m_renderer_text.property_foreground_set() = false;
}
// text channel
@@ -509,23 +476,14 @@ void CellRendererChannels::render_vfunc_channel(const Cairo::RefPtr<Cairo::Conte
const auto id = m_property_id.get_value();
const bool is_muted = discord.IsChannelMuted(id);
- static const auto sfw_unmuted = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelColor);
-
- m_renderer_text.property_sensitive() = false;
static const auto nsfw_color = Gdk::RGBA(Abaddon::Get().GetSettings().NSFWChannelColor);
- if (m_property_nsfw.get_value())
- m_renderer_text.property_foreground_rgba() = nsfw_color;
- else
- m_renderer_text.property_foreground_rgba() = sfw_unmuted;
- if (is_muted) {
- auto col = m_renderer_text.property_foreground_rgba().get_value();
- col.set_red(col.get_red() * 0.5);
- col.set_green(col.get_green() * 0.5);
- col.set_blue(col.get_blue() * 0.5);
- m_renderer_text.property_foreground_rgba() = col;
- }
+
+ auto color = widget.get_style_context()->get_color(Gtk::STATE_FLAG_NORMAL);
+ if (property_nsfw()) color = nsfw_color;
+ if (is_muted) color.set_alpha(0.6);
+
+ m_renderer_text.property_foreground_rgba() = color;
m_renderer_text.render(cr, widget, background_area, text_cell_area, flags);
- // unset foreground to default so properties dont bleed
m_renderer_text.property_foreground_set() = false;
// unread
@@ -535,7 +493,7 @@ void CellRendererChannels::render_vfunc_channel(const Cairo::RefPtr<Cairo::Conte
if (unread_state < 0) return;
if (!is_muted) {
- AddUnreadIndicator(cr, background_area);
+ AddUnreadIndicator(cr, widget, background_area);
}
if (unread_state < 1) return;
@@ -580,18 +538,7 @@ void CellRendererChannels::render_vfunc_thread(const Cairo::RefPtr<Cairo::Contex
const auto id = m_property_id.get_value();
const bool is_muted = discord.IsChannelMuted(id);
- static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelColor);
- if (Abaddon::Get().GetDiscordClient().IsChannelMuted(m_property_id.get_value())) {
- auto muted = color;
- muted.set_red(muted.get_red() * 0.5);
- muted.set_green(muted.get_green() * 0.5);
- muted.set_blue(muted.get_blue() * 0.5);
- m_renderer_text.property_foreground_rgba() = muted;
- } else {
- m_renderer_text.property_foreground_rgba() = color;
- }
m_renderer_text.render(cr, widget, background_area, text_cell_area, flags);
- m_renderer_text.property_foreground_set() = false;
// unread
if (!Abaddon::Get().GetSettings().Unreads) return;
@@ -600,14 +547,7 @@ void CellRendererChannels::render_vfunc_thread(const Cairo::RefPtr<Cairo::Contex
if (unread_state < 0) return;
if (!is_muted) {
- static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().UnreadIndicatorColor);
- cr->set_source_rgb(color.get_red(), color.get_green(), color.get_blue());
- const auto x = background_area.get_x();
- const auto y = background_area.get_y();
- const auto w = background_area.get_width();
- const auto h = background_area.get_height();
- cr->rectangle(x, y, 3, h);
- cr->fill();
+ AddUnreadIndicator(cr, widget, background_area);
}
if (unread_state < 1) return;
@@ -667,31 +607,7 @@ void CellRendererChannels::render_vfunc_voice_channel(const Cairo::RefPtr<Cairo:
cell_area.get_y() + cell_area.get_height() / 2.0 - height / 2.0);
layout->show_in_cairo_context(cr);
- // expander
- constexpr static int len = 5;
- constexpr static int offset = 24;
- int x1, y1, x2, y2, x3, y3;
- if (property_expanded()) {
- x1 = background_area.get_x() + offset;
- y1 = background_area.get_y() + background_area.get_height() / 2 - len;
- x2 = background_area.get_x() + offset + len;
- y2 = background_area.get_y() + background_area.get_height() / 2 + len;
- x3 = background_area.get_x() + offset + len * 2;
- y3 = background_area.get_y() + background_area.get_height() / 2 - len;
- } else {
- x1 = background_area.get_x() + offset;
- y1 = background_area.get_y() + background_area.get_height() / 2 - len;
- x2 = background_area.get_x() + offset + len * 2;
- y2 = background_area.get_y() + background_area.get_height() / 2;
- x3 = background_area.get_x() + offset;
- y3 = background_area.get_y() + background_area.get_height() / 2 + len;
- }
- cr->move_to(x1, y1);
- cr->line_to(x2, y2);
- cr->line_to(x3, y3);
- const auto expander_color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelsExpanderColor);
- cr->set_source_rgb(expander_color.get_red(), expander_color.get_green(), expander_color.get_blue());
- cr->stroke();
+ RenderExpander(24, cr, widget, background_area, property_expanded());
}
// voice participant
@@ -897,18 +813,7 @@ void CellRendererChannels::render_vfunc_dm(const Cairo::RefPtr<Cairo::Context> &
const auto id = m_property_id.get_value();
const bool is_muted = discord.IsChannelMuted(id);
- static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().ChannelColor);
- if (Abaddon::Get().GetDiscordClient().IsChannelMuted(m_property_id.get_value())) {
- auto muted = color;
- muted.set_red(muted.get_red() * 0.5);
- muted.set_green(muted.get_green() * 0.5);
- muted.set_blue(muted.get_blue() * 0.5);
- m_renderer_text.property_foreground_rgba() = muted;
- } else {
- m_renderer_text.property_foreground_rgba() = color;
- }
m_renderer_text.render(cr, widget, background_area, text_cell_area, flags);
- m_renderer_text.property_foreground_set() = false;
Gdk::Cairo::set_source_pixbuf(cr, m_property_pixbuf.get_value(), icon_x, icon_y);
cr->rectangle(icon_x, icon_y, icon_w, icon_h);
@@ -921,14 +826,7 @@ void CellRendererChannels::render_vfunc_dm(const Cairo::RefPtr<Cairo::Context> &
if (unread_state < 0) return;
if (!is_muted) {
- static const auto color = Gdk::RGBA(Abaddon::Get().GetSettings().UnreadIndicatorColor);
- cr->set_source_rgb(color.get_red(), color.get_green(), color.get_blue());
- const auto x = background_area.get_x();
- const auto y = background_area.get_y();
- const auto w = background_area.get_width();
- const auto h = background_area.get_height();
- cr->rectangle(x, y, 3, h);
- cr->fill();
+ AddUnreadIndicator(cr, widget, background_area);
}
}
@@ -955,8 +853,11 @@ void CellRendererChannels::unread_render_mentions(const Cairo::RefPtr<Cairo::Con
int width, height;
layout->get_pixel_size(width, height);
{
- static const auto bg = Gdk::RGBA(Abaddon::Get().GetSettings().MentionBadgeColor);
- static const auto text = Gdk::RGBA(Abaddon::Get().GetSettings().MentionBadgeTextColor);
+ static const auto badge_setting = Gdk::RGBA(Abaddon::Get().GetSettings().MentionBadgeColor);
+ static const auto text_setting = Gdk::RGBA(Abaddon::Get().GetSettings().MentionBadgeTextColor);
+
+ auto bg = badge_setting.get_alpha_u() > 0 ? badge_setting : widget.get_style_context()->get_background_color(Gtk::STATE_FLAG_SELECTED);
+ auto text = text_setting.get_alpha_u() > 0 ? text_setting : widget.get_style_context()->get_color(Gtk::STATE_FLAG_SELECTED);
const auto x = cell_area.get_x() + edge - width - MentionsRightPad;
const auto y = cell_area.get_y() + cell_area.get_height() / 2.0 - height / 2.0 - 1;
diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp
index 10896fb..1db03ed 100644
--- a/src/components/chatinput.cpp
+++ b/src/components/chatinput.cpp
@@ -20,7 +20,7 @@ ChatInputText::ChatInputText() {
m_textview.signal_key_press_event().connect(cb, false);
m_textview.set_hexpand(false);
m_textview.set_halign(Gtk::ALIGN_FILL);
- m_textview.set_valign(Gtk::ALIGN_CENTER);
+ m_textview.set_valign(Gtk::ALIGN_FILL);
m_textview.set_wrap_mode(Gtk::WRAP_WORD_CHAR);
m_textview.show();
add(m_textview);
@@ -113,30 +113,25 @@ ChatInputTextContainer::ChatInputTextContainer() {
};
m_input.signal_key_press_proxy().connect(cb);
+ m_upload_button.set_image(m_upload_img);
+ m_upload_button.set_halign(Gtk::ALIGN_CENTER);
+ m_upload_button.set_valign(Gtk::ALIGN_CENTER);
+ m_upload_button.get_style_context()->add_class(GTK_STYLE_CLASS_FLAT);
+
m_upload_img.property_icon_name() = "document-send-symbolic";
m_upload_img.property_icon_size() = Gtk::ICON_SIZE_LARGE_TOOLBAR;
m_upload_img.get_style_context()->add_class("message-input-browse-icon");
- AddPointerCursor(m_upload_ev);
-
- m_upload_ev.signal_button_press_event().connect([this](GdkEventButton *ev) -> bool {
- if (ev->button == GDK_BUTTON_PRIMARY) {
- ShowFileChooser();
- // return focus
- m_input.grab_focus();
- return true;
- }
- return false;
+ m_upload_button.signal_clicked().connect([this]() {
+ ShowFileChooser();
+ m_input.grab_focus();
});
- m_upload_ev.add(m_upload_img);
- add_overlay(m_upload_ev);
- add(m_input);
+ m_upload_box.pack_start(m_upload_button);
+ pack_start(m_upload_box, false, false);
+ pack_start(m_input);
show_all_children();
-
- // stop the overlay from using (start) padding
- signal_get_child_position().connect(sigc::mem_fun(*this, &ChatInputTextContainer::GetChildPosition), false);
}
void ChatInputTextContainer::ShowFileChooser() {
@@ -160,39 +155,11 @@ ChatInputText &ChatInputTextContainer::Get() {
}
void ChatInputTextContainer::ShowChooserIcon() {
- m_upload_ev.show();
+ m_upload_button.show();
}
void ChatInputTextContainer::HideChooserIcon() {
- m_upload_ev.hide();
-}
-
-bool ChatInputTextContainer::GetChildPosition(Gtk::Widget *child, Gdk::Rectangle &pos) {
- Gtk::Allocation main_alloc;
- {
- auto *grandchild = m_input.get_child();
- int x, y;
- if (grandchild->translate_coordinates(m_input, 0, 0, x, y)) {
- main_alloc.set_x(x);
- main_alloc.set_y(y);
- } else {
- main_alloc.set_x(0);
- main_alloc.set_y(0);
- }
- main_alloc.set_width(grandchild->get_allocated_width());
- main_alloc.set_height(grandchild->get_allocated_height());
- }
-
- Gtk::Requisition min, req;
- child->get_preferred_size(min, req);
-
- // let css move it around
- pos.set_x(0);
- pos.set_y(0);
- pos.set_width(std::max(min.width, std::min(main_alloc.get_width(), req.width)));
- pos.set_height(std::max(min.height, std::min(main_alloc.get_height(), req.height)));
-
- return true;
+ m_upload_button.hide();
}
ChatInputTextContainer::type_signal_add_attachment ChatInputTextContainer::signal_add_attachment() {
diff --git a/src/components/chatinput.hpp b/src/components/chatinput.hpp
index be8c141..231d67c 100644
--- a/src/components/chatinput.hpp
+++ b/src/components/chatinput.hpp
@@ -104,7 +104,7 @@ private:
};
// file upload, text
-class ChatInputTextContainer : public Gtk::Overlay {
+class ChatInputTextContainer : public Gtk::Box {
public:
ChatInputTextContainer();
@@ -116,9 +116,9 @@ public:
private:
void ShowFileChooser();
- bool GetChildPosition(Gtk::Widget *child, Gdk::Rectangle &pos);
- Gtk::EventBox m_upload_ev;
+ Gtk::Box m_upload_box;
+ Gtk::Button m_upload_button;
Gtk::Image m_upload_img;
ChatInputText m_input;
diff --git a/src/components/chatmessage.cpp b/src/components/chatmessage.cpp
index 2c2f9dd..a503294 100644
--- a/src/components/chatmessage.cpp
+++ b/src/components/chatmessage.cpp
@@ -364,7 +364,7 @@ Gtk::Widget *ChatMessageItemContainer::CreateEmbedComponent(const EmbedData &emb
}
return false;
});
- static auto color = Abaddon::Get().GetSettings().LinkColor;
+ const auto color = title_label->get_style_context()->get_color(Gtk::STATE_FLAG_LINK);
title_label->override_color(Gdk::RGBA(color));
title_label->set_markup("<b>" + Glib::Markup::escape_text(*embed.Title) + "</b>");
}
@@ -856,7 +856,8 @@ void ChatMessageItemContainer::HandleLinks(Gtk::TextView &tv) {
std::string link = match.fetch(0);
auto tag = buf->create_tag();
m_link_tagmap[tag] = link;
- tag->property_foreground_rgba() = Gdk::RGBA(Abaddon::Get().GetSettings().LinkColor);
+ const auto color = tv.get_style_context()->get_color(Gtk::STATE_FLAG_LINK);
+ tag->property_foreground_rgba() = color;
tag->set_property("underline", 1); // stupid workaround for vcpkg bug (i think)
const auto chars_start = g_utf8_pointer_to_offset(text.c_str(), text.c_str() + mstart);
diff --git a/src/components/chatwindow.cpp b/src/components/chatwindow.cpp
index aeed4ed..9a2493d 100644
--- a/src/components/chatwindow.cpp
+++ b/src/components/chatwindow.cpp
@@ -5,7 +5,7 @@
#include "chatlist.hpp"
#include "constants.hpp"
#ifdef WITH_LIBHANDY
- #include "channeltabswitcherhandy.hpp"
+#include "channeltabswitcherhandy.hpp"
#endif
ChatWindow::ChatWindow() {
@@ -109,7 +109,13 @@ ChatWindow::ChatWindow() {
m_main->add(*m_meta);
m_main->add(m_progress);
- m_progress.show();
+ m_progress.signal_start().connect([this]() {
+ m_progress.show();
+ });
+
+ m_progress.signal_stop().connect([this]() {
+ m_progress.hide();
+ });
m_main->show();
}
diff --git a/src/components/progressbar.cpp b/src/components/progressbar.cpp
index 75f86bb..65abfae 100644
--- a/src/components/progressbar.cpp
+++ b/src/components/progressbar.cpp
@@ -5,12 +5,19 @@ MessageUploadProgressBar::MessageUploadProgressBar() {
auto &discord = Abaddon::Get().GetDiscordClient();
discord.signal_message_progress().connect([this](const std::string &nonce, float percent) {
if (nonce == m_last_nonce) {
+ if (!m_active) {
+ m_active = true;
+ m_signal_start.emit();
+ }
set_fraction(percent);
}
});
discord.signal_message_send_fail().connect([this](const std::string &nonce, float) {
- if (nonce == m_last_nonce)
+ if (nonce == m_last_nonce) {
set_fraction(0.0);
+ m_active = false;
+ m_signal_stop.emit();
+ }
});
discord.signal_message_create().connect([this](const Message &msg) {
if (msg.IsPending) {
@@ -18,6 +25,16 @@ MessageUploadProgressBar::MessageUploadProgressBar() {
} else if (msg.Nonce.has_value() && (*msg.Nonce == m_last_nonce)) {
m_last_nonce = "";
set_fraction(0.0);
+ m_active = false;
+ m_signal_stop.emit();
}
});
}
+
+MessageUploadProgressBar::type_signal_start MessageUploadProgressBar::signal_start() {
+ return m_signal_start;
+}
+
+MessageUploadProgressBar::type_signal_stop MessageUploadProgressBar::signal_stop() {
+ return m_signal_stop;
+}
diff --git a/src/components/progressbar.hpp b/src/components/progressbar.hpp
index 483ee47..8efb87a 100644
--- a/src/components/progressbar.hpp
+++ b/src/components/progressbar.hpp
@@ -6,5 +6,16 @@ public:
MessageUploadProgressBar();
private:
+ bool m_active = false;
std::string m_last_nonce;
+
+ using type_signal_start = sigc::signal<void()>;
+ using type_signal_stop = sigc::signal<void()>;
+
+ type_signal_start m_signal_start;
+ type_signal_stop m_signal_stop;
+
+public:
+ type_signal_start signal_start();
+ type_signal_stop signal_stop();
};
diff --git a/src/dialogs/setstatus.cpp b/src/dialogs/setstatus.cpp
index 7a3a038..24f0b29 100644
--- a/src/dialogs/setstatus.cpp
+++ b/src/dialogs/setstatus.cpp
@@ -1,17 +1,31 @@
#include "setstatus.hpp"
+static const std::array feelings = {
+ "wonderful",
+ "splendiferous",
+ "delicious",
+ "outstanding",
+ "amazing",
+ "great",
+ "marvelous",
+ "superb",
+ "out of this world",
+ "stupendous",
+ "tip-top",
+ "horrible",
+};
+
SetStatusDialog::SetStatusDialog(Gtk::Window &parent)
: Gtk::Dialog("Set Status", parent, true)
, m_layout(Gtk::ORIENTATION_VERTICAL)
- , m_bottom(Gtk::ORIENTATION_HORIZONTAL)
, m_ok("OK")
- , m_cancel("Cancel")
- , m_bbox(Gtk::ORIENTATION_HORIZONTAL) {
- set_default_size(300, 50);
+ , m_cancel("Cancel") {
+ set_default_size(350, 200);
get_style_context()->add_class("app-window");
get_style_context()->add_class("app-popup");
+ get_style_context()->add_class("set-status-dialog");
- m_text.set_placeholder_text("Status text");
+ m_text.set_placeholder_text("I feel " + Glib::ustring(feelings[rand() % feelings.size()]) + "!");
m_status_combo.append("online", "Online");
m_status_combo.append("dnd", "Do Not Disturb");
@@ -35,16 +49,17 @@ SetStatusDialog::SetStatusDialog(Gtk::Window &parent)
response(Gtk::RESPONSE_CANCEL);
});
- m_bbox.pack_start(m_ok, Gtk::PACK_SHRINK);
- m_bbox.pack_start(m_cancel, Gtk::PACK_SHRINK);
- m_bbox.set_layout(Gtk::BUTTONBOX_END);
+ m_layout.pack_start(*Gtk::make_managed<Gtk::Label>("How are you, " + Abaddon::Get().GetDiscordClient().GetUserData().GetDisplayName() + "?", Gtk::ALIGN_START));
+ m_layout.pack_start(m_text);
+ m_layout.pack_start(*Gtk::make_managed<Gtk::Label>("Status", Gtk::ALIGN_START));
+ m_layout.pack_start(m_status_combo);
+ m_layout.pack_start(*Gtk::make_managed<Gtk::Label>("Activity", Gtk::ALIGN_START));
+ m_layout.pack_start(m_type_combo);
- m_bottom.add(m_status_combo);
- m_bottom.add(m_type_combo);
- m_bottom.add(m_bbox);
- m_layout.add(m_text);
- m_layout.add(m_bottom);
get_content_area()->add(m_layout);
+ get_action_area()->pack_start(m_ok, Gtk::PACK_SHRINK);
+ get_action_area()->pack_start(m_cancel, Gtk::PACK_SHRINK);
+ get_action_area()->set_layout(Gtk::BUTTONBOX_START);
show_all_children();
}
diff --git a/src/dialogs/setstatus.hpp b/src/dialogs/setstatus.hpp
index b0e6a4c..d4a015d 100644
--- a/src/dialogs/setstatus.hpp
+++ b/src/dialogs/setstatus.hpp
@@ -8,14 +8,12 @@ public:
PresenceStatus GetStatusType() const;
std::string GetActivityName() const;
-protected:
+private:
Gtk::Box m_layout;
- Gtk::Box m_bottom;
Gtk::Entry m_text;
Gtk::ComboBoxText m_status_combo;
Gtk::ComboBoxText m_type_combo;
Gtk::Button m_ok;
Gtk::Button m_cancel;
- Gtk::ButtonBox m_bbox;
};
diff --git a/src/settings.cpp b/src/settings.cpp
index c824a34..d1dff3f 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -68,9 +68,7 @@ void SettingsManager::ReadSettings() {
SMINT("http", "concurrent", CacheHTTPConcurrency);
SMSTR("http", "user_agent", UserAgent);
SMSTR("style", "expandercolor", ChannelsExpanderColor);
- SMSTR("style", "linkcolor", LinkColor);
SMSTR("style", "nsfwchannelcolor", NSFWChannelColor);
- SMSTR("style", "channelcolor", ChannelColor);
SMSTR("style", "mentionbadgecolor", MentionBadgeColor);
SMSTR("style", "mentionbadgetextcolor", MentionBadgeTextColor);
SMSTR("style", "unreadcolor", UnreadIndicatorColor);
@@ -159,9 +157,7 @@ void SettingsManager::Close() {
SMINT("http", "concurrent", CacheHTTPConcurrency);
SMSTR("http", "user_agent", UserAgent);
SMSTR("style", "expandercolor", ChannelsExpanderColor);
- SMSTR("style", "linkcolor", LinkColor);
SMSTR("style", "nsfwchannelcolor", NSFWChannelColor);
- SMSTR("style", "channelcolor", ChannelColor);
SMSTR("style", "mentionbadgecolor", MentionBadgeColor);
SMSTR("style", "mentionbadgetextcolor", MentionBadgeTextColor);
SMSTR("style", "unreadcolor", UnreadIndicatorColor);
diff --git a/src/settings.hpp b/src/settings.hpp
index 037233b..419734c 100644
--- a/src/settings.hpp
+++ b/src/settings.hpp
@@ -38,14 +38,11 @@ public:
std::string UserAgent { "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Safari/537.36" };
// [style]
- // TODO: convert to StyleProperty... or maybe not? i still cant figure out what the "correct" method is for this
- std::string LinkColor { "rgba(40, 200, 180, 255)" };
- std::string ChannelsExpanderColor { "rgba(255, 83, 112, 255)" };
- std::string NSFWChannelColor { "#ed6666" };
- std::string ChannelColor { "#fbfbfb" };
- std::string MentionBadgeColor { "#b82525" };
- std::string MentionBadgeTextColor { "#fbfbfb" };
- std::string UnreadIndicatorColor { "#ffffff" };
+ std::string ChannelsExpanderColor { "rgba(255, 83, 112, 0)" };
+ std::string NSFWChannelColor { "#970d0d" };
+ std::string MentionBadgeColor { "rgba(184, 37, 37, 0)" };
+ std::string MentionBadgeTextColor { "rgba(251, 251, 251, 0)" };
+ std::string UnreadIndicatorColor { "rgba(255, 255, 255, 0)" };
// [notifications]
#ifdef _WIN32
diff --git a/src/windows/voicesettingswindow.cpp b/src/windows/voicesettingswindow.cpp
index 97f77b5..1a112f5 100644
--- a/src/windows/voicesettingswindow.cpp
+++ b/src/windows/voicesettingswindow.cpp
@@ -12,6 +12,7 @@
VoiceSettingsWindow::VoiceSettingsWindow()
: m_main(Gtk::ORIENTATION_VERTICAL) {
get_style_context()->add_class("app-window");
+ get_style_context()->add_class("voice-settings-window");
set_default_size(300, 300);
m_encoding_mode.append("Voice");
@@ -115,10 +116,21 @@ VoiceSettingsWindow::VoiceSettingsWindow()
m_signal_gain.emit(m_gain.get_value() / 100.0);
});
- m_main.add(m_encoding_mode);
- m_main.add(m_signal);
- m_main.add(m_bitrate);
- m_main.add(m_gain);
+ auto *layout = Gtk::make_managed<Gtk::HBox>();
+ auto *labels = Gtk::make_managed<Gtk::VBox>();
+ auto *widgets = Gtk::make_managed<Gtk::VBox>();
+ layout->pack_start(*labels, false, true, 5);
+ layout->pack_start(*widgets);
+ labels->pack_start(*Gtk::make_managed<Gtk::Label>("Coding Mode", Gtk::ALIGN_END));
+ labels->pack_start(*Gtk::make_managed<Gtk::Label>("Signal Hint", Gtk::ALIGN_END));
+ labels->pack_start(*Gtk::make_managed<Gtk::Label>("Bitrate", Gtk::ALIGN_END));
+ labels->pack_start(*Gtk::make_managed<Gtk::Label>("Gain", Gtk::ALIGN_END));
+ widgets->pack_start(m_encoding_mode);
+ widgets->pack_start(m_signal);
+ widgets->pack_start(m_bitrate);
+ widgets->pack_start(m_gain);
+
+ m_main.add(*layout);
add(m_main);
show_all_children();
diff --git a/src/windows/voicewindow.cpp b/src/windows/voicewindow.cpp
index 16a9fed..825681c 100644
--- a/src/windows/voicewindow.cpp
+++ b/src/windows/voicewindow.cpp
@@ -181,7 +181,7 @@ VoiceWindow::VoiceWindow(Snowflake channel_id)
m_mix_mono.set_active(audio.GetMixMono());
m_mix_mono.signal_toggled().connect([this]() {
- Abaddon::Get().GetAudio().SetMixMono(m_mix_mono.get_active());
+ Abaddon::Get().GetAudio().SetMixMono(m_mix_mono.get_active());
});
auto *playback_renderer = Gtk::make_managed<Gtk::CellRendererText>();
@@ -225,20 +225,40 @@ VoiceWindow::VoiceWindow(Snowflake channel_id)
window->show();
});
+ auto *sliders_container = Gtk::make_managed<Gtk::HBox>();
+ auto *sliders_labels = Gtk::make_managed<Gtk::VBox>();
+ auto *sliders_sliders = Gtk::make_managed<Gtk::VBox>();
+ sliders_container->pack_start(*sliders_labels, false, true, 2);
+ sliders_container->pack_start(*sliders_sliders);
+ sliders_labels->pack_start(*Gtk::make_managed<Gtk::Label>("Threshold", Gtk::ALIGN_END));
+ sliders_labels->pack_start(*Gtk::make_managed<Gtk::Label>("Gain", Gtk::ALIGN_END));
+ sliders_sliders->pack_start(m_vad_param);
+ sliders_sliders->pack_start(m_capture_gain);
+
+ auto *combos_container = Gtk::make_managed<Gtk::HBox>();
+ auto *combos_labels = Gtk::make_managed<Gtk::VBox>();
+ auto *combos_combos = Gtk::make_managed<Gtk::VBox>();
+ combos_container->pack_start(*combos_labels, false, true, 6);
+ combos_container->pack_start(*combos_combos, Gtk::PACK_EXPAND_WIDGET, 6);
+ combos_labels->pack_start(*Gtk::make_managed<Gtk::Label>("VAD Method", Gtk::ALIGN_END));
+ combos_labels->pack_start(*Gtk::make_managed<Gtk::Label>("Output Device", Gtk::ALIGN_END));
+ combos_labels->pack_start(*Gtk::make_managed<Gtk::Label>("Input Device", Gtk::ALIGN_END));
+ combos_combos->pack_start(m_vad_combo);
+ combos_combos->pack_start(m_playback_combo);
+ combos_combos->pack_start(m_capture_combo);
+
m_scroll.add(m_user_list);
m_controls.add(m_mute);
m_controls.add(m_deafen);
m_controls.add(m_noise_suppression);
m_controls.add(m_mix_mono);
- m_main.add(m_menu_bar);
- m_main.add(m_controls);
- m_main.add(m_vad_value);
- m_main.add(m_vad_param);
- m_main.add(m_capture_gain);
- m_main.add(m_scroll);
- m_main.add(m_vad_combo);
- m_main.add(m_playback_combo);
- m_main.add(m_capture_combo);
+ m_main.pack_start(m_menu_bar);
+ m_main.pack_start(m_controls);
+ m_main.pack_start(m_vad_value);
+ m_main.pack_start(*Gtk::make_managed<Gtk::Label>("Input Settings"));
+ m_main.pack_start(*sliders_container);
+ m_main.pack_start(m_scroll);
+ m_main.pack_start(*combos_container, Gtk::PACK_EXPAND_WIDGET, 2);
add(m_main);
show_all_children();
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-23 23:13:07 +0000