Mirrors/rofi
2
0
Fork 0
mirror of https://github.com/lbonn/rofi synced 2025-02-17 05:18:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Textbox] cairo_save/restore does not store path.

Browse source 
Fix by moving cairo_move_to to after blink.
Also fix drawing outline.
This commit is contained in:
Dave Davenport 2023-02-23 15:14:11 +01:00
parent f6248c6ea9
commit a5bd8bc630
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/widgets/textbox.c
View file

@ -505,7 +505,6 @@ static void textbox_draw(widget *wid, cairo_t *draw) {
MAX(0, tb->widget.w - widget_padding_get_padding_width(WIDGET(tb)) - MAX(0, tb->widget.w - widget_padding_get_padding_width(WIDGET(tb)) -
line_width - dot_offset); line_width - dot_offset);
x = (tb->xalign - 0.5) * rem + widget_padding_get_left(WIDGET(tb)); x = (tb->xalign - 0.5) * rem + widget_padding_get_left(WIDGET(tb));
cairo_move_to(draw, x, top);
break; break;
} }
case PANGO_ALIGN_RIGHT: { case PANGO_ALIGN_RIGHT: {
@ -513,7 +512,6 @@ static void textbox_draw(widget *wid, cairo_t *draw) {
MAX(0, tb->widget.w - widget_padding_get_padding_width(WIDGET(tb)) - MAX(0, tb->widget.w - widget_padding_get_padding_width(WIDGET(tb)) -
line_width - dot_offset); line_width - dot_offset);
x = -(1.0 - tb->xalign) * rem + widget_padding_get_left(WIDGET(tb)); x = -(1.0 - tb->xalign) * rem + widget_padding_get_left(WIDGET(tb));
cairo_move_to(draw, x, top);
break; break;
} }
default: { default: {
@ -522,7 +520,6 @@ static void textbox_draw(widget *wid, cairo_t *draw) {
line_width - dot_offset); line_width - dot_offset);
x = tb->xalign * rem + widget_padding_get_left(WIDGET(tb)); x = tb->xalign * rem + widget_padding_get_left(WIDGET(tb));
x += dot_offset; x += dot_offset;
cairo_move_to(draw, x, top);
break; break;
} }
} }
@ -547,13 +544,12 @@ static void textbox_draw(widget *wid, cairo_t *draw) {
if ((x + cursor_x) != tb->cursor_x_pos) { if ((x + cursor_x) != tb->cursor_x_pos) {
tb->cursor_x_pos = x + cursor_x; tb->cursor_x_pos = x + cursor_x;
} }
if (tb->blink) { if ( tb->blink) {
// use text color as fallback for themes that don't specify the cursor // use text color as fallback for themes that don't specify the cursor
// color // color
cairo_save(draw);
rofi_theme_get_color(WIDGET(tb), "cursor-color", draw); rofi_theme_get_color(WIDGET(tb), "cursor-color", draw);
cairo_rectangle(draw, x + cursor_x, y + cursor_y, cursor_pixel_width, cairo_rectangle(draw, x + cursor_x, y + cursor_y, cursor_pixel_width,
cursor_height); cursor_height);
if (rofi_theme_get_boolean(WIDGET(tb), "cursor-outline", FALSE)) { if (rofi_theme_get_boolean(WIDGET(tb), "cursor-outline", FALSE)) {
cairo_fill_preserve(draw); cairo_fill_preserve(draw);
rofi_theme_get_color(WIDGET(tb), "cursor-outline-color", draw); rofi_theme_get_color(WIDGET(tb), "cursor-outline-color", draw);
@ -564,7 +560,6 @@ static void textbox_draw(widget *wid, cairo_t *draw) {
} else { } else {
cairo_fill(draw); cairo_fill(draw);
} }
cairo_restore(draw);
} }
} }
@ -578,11 +573,13 @@ static void textbox_draw(widget *wid, cairo_t *draw) {
rofi_theme_get_color(WIDGET(tb), "placeholder-color", draw); rofi_theme_get_color(WIDGET(tb), "placeholder-color", draw);
show_outline = FALSE; show_outline = FALSE;
} }
cairo_move_to(draw, x, top);
pango_cairo_show_layout(draw, tb->layout); pango_cairo_show_layout(draw, tb->layout);
if (show_outline) { if (show_outline) {
rofi_theme_get_color(WIDGET(tb), "text-outline-color", draw); rofi_theme_get_color(WIDGET(tb), "text-outline-color", draw);
double width = rofi_theme_get_double(WIDGET(tb), "text-outline-width", 0.5); double width = rofi_theme_get_double(WIDGET(tb), "text-outline-width", 0.5);
cairo_move_to(draw, x, top);
pango_cairo_layout_path(draw, tb->layout); pango_cairo_layout_path(draw, tb->layout);
cairo_set_line_width(draw, width); cairo_set_line_width(draw, width);
cairo_stroke(draw); cairo_stroke(draw);