PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-03-10 17:06:37 -04:00
Code Releases Activity

[TextBox] Fix yalign for cursor and icon.

Browse source
This commit is contained in:
Dave Davenport 2017-06-06 09:09:57 +02:00
parent e5579cbde0
commit 27d1da76b1
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/widgets/textbox.c
View file

@ -413,7 +413,14 @@ static void textbox_draw ( widget *wid, cairo_t *draw )
// Skip the side MARGIN on the X axis. // Skip the side MARGIN on the X axis.
int x = widget_padding_get_left ( WIDGET ( tb ) ); int x = widget_padding_get_left ( WIDGET ( tb ) );
int top = widget_padding_get_top ( WIDGET ( tb ) ); int top = widget_padding_get_top ( WIDGET ( tb ) );
int y = top + ( pango_font_metrics_get_ascent ( tb->metrics ) - pango_layout_get_baseline ( tb->layout ) ) / PANGO_SCALE; int y = ( pango_font_metrics_get_ascent ( tb->metrics ) - pango_layout_get_baseline ( tb->layout ) ) / PANGO_SCALE;
if ( tb->yalign > 0.001 ) {
int height = ( pango_font_metrics_get_ascent ( tb->metrics ) + pango_font_metrics_get_descent ( tb->metrics ) ) / PANGO_SCALE;
int bottom = widget_padding_get_bottom ( WIDGET ( tb ) );
top = ( tb->widget.h - bottom - height - top ) * tb->yalign + top;
}
y+=top;
// draw Icon // draw Icon
if ( ( tb->flags & TB_ICON ) == TB_ICON && tb->icon != NULL ) { if ( ( tb->flags & TB_ICON ) == TB_ICON && tb->icon != NULL ) {
@ -442,12 +449,6 @@ static void textbox_draw ( widget *wid, cairo_t *draw )
int tw = textbox_get_font_width ( tb ); int tw = textbox_get_font_width ( tb );
x = ( ( tb->widget.w - tw - widget_padding_get_padding_width ( WIDGET ( tb ) ) - offset ) ) / 2; x = ( ( tb->widget.w - tw - widget_padding_get_padding_width ( WIDGET ( tb ) ) - offset ) ) / 2;
} }
if ( tb->yalign > 0.001 ) {
int height = ( pango_font_metrics_get_ascent ( tb->metrics ) + pango_font_metrics_get_descent ( tb->metrics ) ) / PANGO_SCALE;
int bottom = widget_padding_get_bottom ( WIDGET ( tb ) );
top = ( tb->widget.h - bottom - height - top ) * tb->yalign + top;
}
// TODO check if this is still needed after flatning. // TODO check if this is still needed after flatning.
cairo_set_operator ( draw, CAIRO_OPERATOR_OVER ); cairo_set_operator ( draw, CAIRO_OPERATOR_OVER );