PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-02-03 15:34:54 -05:00
Code Releases Activity

Fiddle with the corners again.. less complecated is good

Browse source
This commit is contained in:
Dave Davenport 2017-02-08 10:15:38 +01:00
parent 7b3e0918cf
commit 1d6b1494e9
1 changed files with 58 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
source/widgets/widget.c
View file

@ -182,10 +182,12 @@ void widget_draw ( widget *widget, cairo_t *d )
cairo_new_path ( d );
rofi_theme_get_color ( widget, "foreground", d );
if ( left > 0 ) {
double offset = ( radius_tl > 0 )? top/2.0:0;
cairo_set_line_width ( d, left );
distance_get_linestyle ( widget->border.left, d );
cairo_move_to ( d, margin_left + left / 2.0, margin_top + radius_tl );
cairo_line_to ( d, margin_left + left / 2.0, widget->h - margin_bottom - radius_bl );
cairo_move_to ( d, margin_left + left / 2.0, margin_top + radius_tl +offset );
offset = ( radius_bl > 0 )? bottom/2.0:0;
cairo_line_to ( d, margin_left + left / 2.0, widget->h - margin_bottom - radius_bl - offset );
cairo_stroke ( d );
}
if ( radius_tl > 0 ) {
@ -198,25 +200,26 @@ void widget_draw ( widget *widget, cairo_t *d )
}
else {
cairo_set_line_width ( d, 0 );
cairo_arc ( d, margin_left + radius_tl, margin_top + radius_tl, radius_tl, -M_PI, -0.5 * M_PI );
double a = ( radius_tl - left );
double b = ( radius_tl - top );
double be = acos ( ( 0.5 * sqrt ( a * a + b * b ) ) / radius_tl );
double a1 = atan ( a / b ) + be - 0.5 * M_PI;
double ai = 2 * ( 0.5 * M_PI - be );
cairo_arc_negative ( d,
margin_left + left + cos ( a1 ) * radius_tl,
margin_top + ( radius_tl ) + radius_tl * sin ( a1 ),
radius_tl, -M_PI + a1 + ai, -M_PI + a1 );
cairo_line_to ( d, margin_left, margin_top + radius_tl );
cairo_fill ( d );
double minof = ceil(MIN ( left/2.0, top/2.0));
double radius_outer = radius_tl+minof;
double radius_inner = radius_tl-minof;
cairo_arc ( d , margin_left+radius_outer, margin_top + radius_outer, radius_outer, -M_PI, -0.5*M_PI);
cairo_line_to ( d , margin_left+radius_tl+ceil(left/2.0), margin_top );
cairo_line_to ( d , margin_left+radius_tl+ceil(left/2.0), margin_top+top);
cairo_arc_negative ( d , margin_left+left+radius_inner, margin_top+top+radius_inner, radius_inner, -0.5*M_PI, M_PI);
cairo_line_to ( d , margin_left+left, margin_top+radius_tl+ceil(top/2.0));
cairo_line_to ( d , margin_left, margin_top+radius_tl+ceil(top/2.0));
cairo_close_path ( d );
cairo_fill( d );
}
}
if ( right > 0 ) {
double offset = (radius_tr > 0 )? top/2.0:0;
cairo_set_line_width ( d, right );
distance_get_linestyle ( widget->border.right, d );
cairo_move_to ( d, widget->w - margin_right - right / 2.0, margin_top + radius_tr );
cairo_line_to ( d, widget->w - margin_right - right / 2.0, widget->h - margin_bottom - radius_br );
cairo_move_to ( d, widget->w - margin_right - right / 2.0, margin_top + radius_tr +offset );
offset = ( radius_br > 0 )? bottom/2.0:0;
cairo_line_to ( d, widget->w - margin_right - right / 2.0, widget->h - margin_bottom - radius_br - offset );
cairo_stroke ( d );
}
if ( radius_tr > 0 ) {
@ -228,25 +231,26 @@ void widget_draw ( widget *widget, cairo_t *d )
}
else {
cairo_set_line_width ( d, 0 );
cairo_arc ( d, widget->w - margin_right - radius_tr, margin_top + radius_tr, radius_tr, -0.5 * M_PI, 0 );
double a = ( radius_tr - right );
double b = ( radius_tr - top );
double be = acos ( ( 0.5 * sqrt ( a * a + b * b ) ) / radius_tr );
double a1 = atan ( a / b ) + be - 0.5 * M_PI;
double ai = 2 * ( 0.5 * M_PI - be );
cairo_arc_negative ( d,
widget->w - margin_right - right - cos ( a1 ) * radius_tr,
margin_top + radius_tr * ( 1 + sin ( a1 ) ), radius_tr,
0 - a1, -a1 - ai );
cairo_line_to ( d, widget->w - margin_right - radius_tr, margin_top );
cairo_fill ( d );
double minof = ceil(MIN ( right/2.0, top/2.0));
double radius_outer = radius_tr+minof;
double radius_inner = radius_tr-minof;
cairo_arc ( d , widget->w - margin_right - radius_outer, margin_top + radius_outer, radius_outer, -0.5*M_PI, 0);
cairo_line_to ( d , widget->w-margin_right, margin_top + radius_tr+ceil(top/2.0) );
cairo_line_to ( d , widget->w-margin_right-right, margin_top+radius_tr+ceil(top/2.0));
cairo_arc_negative ( d , widget->w-margin_right-right-radius_inner, margin_top+top+radius_inner, radius_inner, 0, -0.5*M_PI);
cairo_line_to ( d ,widget->w-margin_right - radius_tr - ceil(right/2.0), margin_top+top);
cairo_line_to ( d ,widget->w-margin_right - radius_tr - ceil(right/2.0), margin_top);
cairo_close_path ( d );
cairo_fill( d );
}
}
if ( top > 0 ) {
double offset = (radius_tl > 0 ) ? (left/2.0):0;
cairo_set_line_width ( d, top );
distance_get_linestyle ( widget->border.top, d );
cairo_move_to ( d, margin_left + radius_tl, margin_top + top / 2.0 );
cairo_line_to ( d, widget->w - margin_right - radius_tr, margin_top + top / 2.0 );
cairo_move_to ( d, margin_left + radius_tl+offset, margin_top + top / 2.0 );
offset = (radius_tr > 0 )? right/2.0:0;
cairo_line_to ( d, widget->w - margin_right - radius_tr-offset, margin_top + top / 2.0 );
cairo_stroke ( d );
}
if ( radius_bl > 0 ) {
@ -258,25 +262,26 @@ void widget_draw ( widget *widget, cairo_t *d )
}
else {
cairo_set_line_width ( d, 0 );
cairo_arc ( d, margin_left + radius_bl, widget->h - margin_bottom - radius_bl, radius_bl, 0.5 * M_PI, M_PI );
double a = ( radius_bl - left );
double b = ( radius_bl - bottom );
double be = acos ( ( 0.5 * sqrt ( a * a + b * b ) ) / radius_bl );
double a1 = atan ( a / b ) + be - 0.5 * M_PI;
double ai = 2 * ( 0.5 * M_PI - be );
cairo_arc_negative ( d,
margin_left + left + cos ( a1 ) * radius_bl,
widget->h - margin_bottom - radius_bl * ( 1 + sin ( a1 ) ), radius_bl,
1.0 * M_PI - a1, 1.0 * M_PI - a1 - ai );
cairo_line_to ( d, margin_left + radius_bl, widget->h - margin_bottom );
double minof = ceil(MIN ( left/2.0, bottom/2.0));
double radius_outer = radius_bl+minof;
double radius_inner = radius_bl-minof;
cairo_arc ( d , margin_left+radius_outer, widget->h - margin_bottom - radius_outer, radius_outer, 0.5*M_PI,M_PI);
cairo_line_to ( d , margin_left, widget->h- margin_bottom-radius_bl-ceil(bottom/2.0));
cairo_line_to ( d , margin_left+left, widget->h - margin_bottom-radius_bl-ceil(bottom/2.0));
cairo_arc_negative ( d , margin_left+left+radius_inner, widget->h - margin_bottom-bottom-radius_inner, radius_inner, M_PI, 0.5*M_PI);
cairo_line_to ( d , margin_left+radius_bl+ceil(left/2.0), widget->h - margin_bottom-bottom);
cairo_line_to ( d , margin_left+radius_bl+ceil(left/2.0), widget->h - margin_bottom );
cairo_close_path ( d );
cairo_fill ( d );
}
}
if ( bottom > 0 ) {
double offset = (radius_bl > 0 )? (left/2.0):0;
cairo_set_line_width ( d, bottom );
distance_get_linestyle ( widget->border.bottom, d );
cairo_move_to ( d, margin_left + radius_bl, widget->h - bottom / 2.0 - margin_bottom );
cairo_line_to ( d, widget->w - margin_right - radius_br, widget->h - bottom / 2.0 - margin_bottom );
cairo_move_to ( d, margin_left + radius_bl + offset, widget->h - bottom / 2.0 - margin_bottom );
offset = ( radius_br > 0)? (right/2.0):0;
cairo_line_to ( d, widget->w - margin_right - radius_br-offset, widget->h - bottom / 2.0 - margin_bottom );
cairo_stroke ( d );
}
if ( radius_br > 0 ) {
@ -288,17 +293,16 @@ void widget_draw ( widget *widget, cairo_t *d )
}
else {
cairo_set_line_width ( d, 0 );
cairo_arc ( d, widget->w - margin_right - radius_br, widget->h - margin_bottom - radius_br, radius_br, 0.0 * M_PI, 0.5 * M_PI );
double a = ( radius_br - right );
double b = ( radius_br - bottom );
double be = acos ( ( 0.5 * sqrt ( a * a + b * b ) ) / radius_br );
double a1 = atan ( a / b ) + be - 0.5 * M_PI;
double ai = 2 * ( 0.5 * M_PI - be );
cairo_arc_negative ( d,
widget->w - margin_right - right - cos ( a1 ) * radius_br,
widget->h - margin_bottom - radius_br * ( 1 + sin ( a1 ) ), radius_br,
0.0 * M_PI + a1 + ai, 0.0 * M_PI + a1 );
cairo_line_to ( d, widget->w - margin_right, widget->h - margin_bottom - radius_br );
double minof = ceil(MIN ( right/2.0, bottom/2.0));
double radius_outer = radius_br+minof;
double radius_inner = radius_br-minof;
cairo_arc ( d , widget->w - margin_right-radius_outer, widget->h - margin_bottom - radius_outer, radius_outer, 0.0,0.5*M_PI);
cairo_line_to ( d , widget->w - margin_right-radius_br-ceil(right/2.0), widget->h - margin_bottom );
cairo_line_to ( d , widget->w - margin_right-radius_br-ceil(right/2.0), widget->h - margin_bottom-bottom);
cairo_arc_negative ( d , widget->w-margin_right-right-radius_inner, widget->h - margin_bottom-bottom-radius_inner, radius_inner, 0.5*M_PI, 0.0 );
cairo_line_to ( d , widget->w-margin_right-right, widget->h - margin_bottom-radius_br-ceil(bottom/2.0));
cairo_line_to ( d , widget->w-margin_right, widget->h- margin_bottom-radius_br-ceil(bottom/2.0));
cairo_close_path ( d );
cairo_fill ( d );
}
}