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

Fix regression of being unable to select text

Browse source
This commit is contained in:
Marvin W 2017-03-13 22:53:36 +01:00
parent 2d6f580c87
commit 092edaf9fd
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
3 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
main/src/ui/conversation_summary/merged_message_item.vala
View file

@ -42,20 +42,12 @@ public class MergedMessageItem : Grid {
name_label.label = Util.get_message_display_name(stream_interactor, message, conversation.account); name_label.label = Util.get_message_display_name(stream_interactor, message, conversation.account);
update_display_style(); update_display_style();
message_text_view.style_updated.connect(style_changed); Util.force_base_background(message_text_view, "textview, text:not(:selected)");
} message_text_view.style_updated.connect(update_display_style);
private void style_changed() {
lock(message_text_view) {
message_text_view.style_updated.disconnect(style_changed);
update_display_style();
message_text_view.style_updated.connect(style_changed);
}
} }
private void update_display_style() { private void update_display_style() {
TextView tmp = new TextView(); RGBA bg = get_style_context().get_background_color(StateFlags.NORMAL);
RGBA bg = tmp.get_style_context().get_background_color(StateFlags.NORMAL);
bool dark_theme = (bg.red < 0.5 && bg.green < 0.5 && bg.blue < 0.5); bool dark_theme = (bg.red < 0.5 && bg.green < 0.5 && bg.blue < 0.5);
string display_name = Util.get_message_display_name(stream_interactor, messages[0], conversation.account); string display_name = Util.get_message_display_name(stream_interactor, messages[0], conversation.account);
@ -64,8 +56,6 @@ public class MergedMessageItem : Grid {
LinkButton lnk = new LinkButton("http://example.com"); LinkButton lnk = new LinkButton("http://example.com");
RGBA link_color = lnk.get_style_context().get_color(StateFlags.LINK); RGBA link_color = lnk.get_style_context().get_color(StateFlags.LINK);
link_tag.foreground_rgba = link_color; link_tag.foreground_rgba = link_color;
message_text_view.override_background_color(0, {0,0,0,0});
} }
public void update() { public void update() {

17
main/src/ui/conversation_summary/view.vala
View file

@ -50,22 +50,7 @@ public class View : Box {
return true; return true;
}); });
update_background_color(); Util.force_base_background(this);
this.style_updated.connect(style_changed);
}
private void update_background_color() {
TextView tmp = new TextView();
this.override_background_color(0, tmp.get_style_context().get_background_color(0));
main.override_background_color(0, tmp.get_style_context().get_background_color(0));
}
private void style_changed() {
lock (main) {
this.style_updated.disconnect(style_changed);
update_background_color();
this.style_updated.connect(style_changed);
}
} }
public void initialize_for_conversation(Conversation? conversation) { public void initialize_for_conversation(Conversation? conversation) {

16
main/src/ui/util.vala
View file

@ -74,6 +74,22 @@ public class Util : Object {
if (scale == 0) scale = image.get_scale_factor(); if (scale == 0) scale = image.get_scale_factor();
image.set_from_surface(Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale, image.get_window())); image.set_from_surface(Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale, image.get_window()));
} }
private const string force_background_css = "%s { background-color: %s; }";
public static void force_background(Gtk.Widget widget, string color, string selector = "*") {
var p = new Gtk.CssProvider();
try {
p.load_from_data(force_background_css.printf(selector, color));
widget.get_style_context().add_provider(p, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
} catch (GLib.Error err) {
// handle err
}
}
public static void force_base_background(Gtk.Widget widget, string selector = "*") {
force_background(widget, "@theme_base_color", selector);
}
} }
} }