Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/xo-misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1722,9 +1722,21 @@ void set_cur_color(int color_no, guint color_rgba)
update_mapping_linkings(tool);
}

void text_background_color(GdkColor *color, GdkColor *bgcolor)
{
// http://stackoverflow.com/a/3943023/2085149
double sum = color->red*0.299 + color->green*0.587 + color->blue*0.114;
if (sum > 47802) {
gdk_color_parse ("black", bgcolor);
} else {
gdk_color_parse ("white", bgcolor);
}
}

void recolor_temp_text(int color_no, guint color_rgba)
{
GdkColor gdkcolor;
GdkColor bgcolor;

if (ui.cur_item_type!=ITEM_TEXT) return;
if (ui.cur_item->text!=NULL && ui.cur_item->brush.color_rgba != color_rgba) {
Expand All @@ -1738,7 +1750,9 @@ void recolor_temp_text(int color_no, guint color_rgba)
ui.cur_item->brush.color_no = color_no;
ui.cur_item->brush.color_rgba = color_rgba;
rgb_to_gdkcolor(color_rgba, &gdkcolor);
text_background_color(&gdkcolor, &bgcolor);
gtk_widget_modify_text(ui.cur_item->widget, GTK_STATE_NORMAL, &gdkcolor);
gtk_widget_modify_base(ui.cur_item->widget, GTK_STATE_NORMAL, &bgcolor);
gtk_widget_grab_focus(ui.cur_item->widget);
}

Expand Down
1 change: 1 addition & 0 deletions src/xo-misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ void update_mapping_linkings(int toolno);
void do_switch_page_with_undo(int pg, gboolean rescroll, gboolean refresh_all);
void do_switch_page(int pg, gboolean rescroll, gboolean refresh_all);
void set_cur_color(int color_no, guint color_rgba);
void text_background_color(GdkColor *color, GdkColor *bgcolor);
void recolor_temp_text(int color_no, guint color_rgba);
void process_color_activate(GtkMenuItem *menuitem, int color_no, guint color_rgba);
void process_thickness_activate(GtkMenuItem *menuitem, int tool, int val);
Expand Down
3 changes: 3 additions & 0 deletions src/xo-paint.c
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@ void start_text(GdkEvent *event, struct Item *item)
GnomeCanvasItem *canvas_item;
PangoFontDescription *font_desc;
GdkColor color;
GdkColor bgcolor;

get_pointer_coords(event, pt);

Expand Down Expand Up @@ -661,6 +662,8 @@ void start_text(GdkEvent *event, struct Item *item)
gtk_widget_modify_font(item->widget, font_desc);
rgb_to_gdkcolor(item->brush.color_rgba, &color);
gtk_widget_modify_text(item->widget, GTK_STATE_NORMAL, &color);
text_background_color(&color, &bgcolor);
gtk_widget_modify_base(item->widget, GTK_STATE_NORMAL, &bgcolor);
pango_font_description_free(font_desc);

canvas_item = gnome_canvas_item_new(ui.cur_layer->group,
Expand Down