Commit e11da3c9b949cc282d67aa3f16381209567460ba
1 parent
7d1ce9db
Exists in
master
and in
1 other branch
Corrigindo fontes editados em windows e desenho do spinner da OIA
Showing
1 changed file
with
15 additions
and
11 deletions
Show diff stats
@@ -100,9 +100,9 @@ static gint draw_spinner(cairo_t *cr, GdkRectangle *r, GdkRGBA *color, gint step | @@ -100,9 +100,9 @@ static gint draw_spinner(cairo_t *cr, GdkRectangle *r, GdkRGBA *color, gint step | ||
100 | cairo_save(cr); | 100 | cairo_save(cr); |
101 | 101 | ||
102 | cairo_set_source_rgba (cr, | 102 | cairo_set_source_rgba (cr, |
103 | - color[V3270_COLOR_OIA_SPINNER].red / 65535., | ||
104 | - color[V3270_COLOR_OIA_SPINNER].green / 65535., | ||
105 | - color[V3270_COLOR_OIA_SPINNER].blue / 65535., | 103 | + color[V3270_COLOR_OIA_SPINNER].red, |
104 | + color[V3270_COLOR_OIA_SPINNER].green, | ||
105 | + color[V3270_COLOR_OIA_SPINNER].blue, | ||
106 | t); | 106 | t); |
107 | 107 | ||
108 | cairo_set_line_width (cr, 2.0); | 108 | cairo_set_line_width (cr, 2.0); |
@@ -953,20 +953,24 @@ static gboolean update_timer(struct timer_info *info) | @@ -953,20 +953,24 @@ static gboolean update_timer(struct timer_info *info) | ||
953 | } | 953 | } |
954 | 954 | ||
955 | #ifdef HAVE_LIBM | 955 | #ifdef HAVE_LIBM |
956 | - rect = info->terminal->oia_rect + V3270_OIA_SPINNER; | 956 | + |
957 | + rect = info->terminal->oia_rect + V3270_OIA_SPINNER; | ||
957 | 958 | ||
958 | #ifdef DEBUG | 959 | #ifdef DEBUG |
959 | - cairo_set_source_rgb(cr,0.1,0.1,0.1); | 960 | + cairo_set_source_rgb(cr,0.1,0.1,0.1); |
960 | #else | 961 | #else |
961 | - gdk_cairo_set_source_rgba(cr,info->terminal->color+V3270_COLOR_OIA_BACKGROUND); | 962 | + gdk_cairo_set_source_rgba(cr,info->terminal->color+V3270_COLOR_OIA_BACKGROUND); |
962 | #endif | 963 | #endif |
963 | - cairo_rectangle(cr, rect->x, rect->y, rect->width, rect->height); | ||
964 | - cairo_fill(cr); | ||
965 | 964 | ||
966 | - gdk_cairo_set_source_rgba(cr,info->terminal->color+V3270_COLOR_OIA_FOREGROUND); | 965 | + cairo_rectangle(cr, rect->x, rect->y, rect->width, rect->height); |
966 | + cairo_fill(cr); | ||
967 | + | ||
968 | + gdk_cairo_set_source_rgba(cr,info->terminal->color+V3270_COLOR_OIA_FOREGROUND); | ||
969 | + | ||
970 | + info->step = draw_spinner(cr, rect, info->terminal->color, info->step); | ||
971 | + | ||
972 | + gtk_widget_queue_draw_area(GTK_WIDGET(info->terminal),rect->x,rect->y,rect->width,rect->height); | ||
967 | 973 | ||
968 | - info->step = draw_spinner(cr, rect, info->terminal->color, info->step); | ||
969 | - gtk_widget_queue_draw_area(GTK_WIDGET(info->terminal),rect->x,rect->y,rect->width,rect->height); | ||
970 | #endif // HAVE_LIBM | 974 | #endif // HAVE_LIBM |
971 | 975 | ||
972 | cairo_destroy(cr); | 976 | cairo_destroy(cr); |