anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Reactions: Improve style

Browse source
This commit is contained in:
fiaxh 2022-10-11 17:56:50 +02:00
parent 09829b3382
commit a45280f8df
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
main/data/theme.css
View file

@ -174,12 +174,17 @@ window.dino-main .multiparty-participants {
/* Reactions */ /* Reactions */
window.dino-main menubutton.reaction-box image {
margin-left: 5px;
margin-right: 5px;
}
window.dino-main button.reaction-box, window.dino-main button.reaction-box,
window.dino-main menubutton.reaction-box > button { window.dino-main menubutton.reaction-box > button {
border: 1px solid transparent; border: 1px solid transparent;
padding: 3px 5px ; padding: 3px 5px ;
border-radius: 10px; border-radius: 10px;
background-color: alpha(@theme_fg_color, 0.05); background-color: alpha(@theme_fg_color, 0.07);
background-image: none; background-image: none;
box-shadow: none; box-shadow: none;
min-height: 0; min-height: 0;

14
main/src/ui/conversation_content_view/reactions_widget.vala
View file

@ -49,7 +49,7 @@ public class ReactionsController : Object {
} }
private void initialize_widget() { private void initialize_widget() {
widget = new ReactionsWidget() { visible=true }; widget = new ReactionsWidget();
widget.emoji_picked.connect((emoji) => { widget.emoji_picked.connect((emoji) => {
stream_interactor.get_module(Reactions.IDENTITY).add_reaction(conversation, content_item, emoji); stream_interactor.get_module(Reactions.IDENTITY).add_reaction(conversation, content_item, emoji);
}); });
@ -127,7 +127,7 @@ public class ReactionsWidget : Grid {
this.row_spacing = this.column_spacing = 5; this.row_spacing = this.column_spacing = 5;
this.margin_top = 2; this.margin_top = 2;
add_button = new MenuButton() { tooltip_text= _("Add reaction"), visible=true }; add_button = new MenuButton() { tooltip_text= _("Add reaction") };
add_button.get_style_context().add_class("reaction-box"); add_button.get_style_context().add_class("reaction-box");
Util.menu_button_set_icon_with_size(add_button, "dino-emoticon-add-symbolic", 14); Util.menu_button_set_icon_with_size(add_button, "dino-emoticon-add-symbolic", 14);
@ -140,11 +140,11 @@ public class ReactionsWidget : Grid {
public void update_reaction(string reaction, int count, bool own, Gee.List<string> names) { public void update_reaction(string reaction, int count, bool own, Gee.List<string> names) {
if (!reaction_buttons.has_key(reaction)) { if (!reaction_buttons.has_key(reaction)) {
Label reaction_label = new Label("<span size='small'>" + reaction + "</span>") { use_markup=true, visible=true }; Label reaction_label = new Label("<span size='small'>" + reaction + "</span>") { use_markup=true };
Label count_label = new Label("") { use_markup=true, visible=true }; Label count_label = new Label("") { use_markup=true };
Button button = new Button() { visible=true }; Button button = new Button();
button.get_style_context().add_class("reaction-box"); button.get_style_context().add_class("reaction-box");
Box reaction_box = new Box(Orientation.HORIZONTAL, 4) { visible=true }; Box reaction_box = new Box(Orientation.HORIZONTAL, 4);
reaction_box.append(reaction_label); reaction_box.append(reaction_label);
reaction_box.append(count_label); reaction_box.append(count_label);
button.set_child(reaction_box); button.set_child(reaction_box);
@ -162,7 +162,7 @@ public class ReactionsWidget : Grid {
}); });
} }
reaction_counts[reaction].label = "<span size='small'>" + count.to_string() + "</span>"; reaction_counts[reaction].label = "<span font_family='monospace' size='small'>" + count.to_string() + "</span>";
if (own) { if (own) {
reaction_buttons[reaction].get_style_context().add_class("own-reaction"); reaction_buttons[reaction].get_style_context().add_class("own-reaction");
} else { } else {