Author: cazfi
Date: Thu Jan 1 18:11:08 2015
New Revision: 27471
URL: http://svn.gna.org/viewcvs/freeciv?rev=27471&view=rev
Log:
Replaced outcommented and non-working putframe() calls targeted to a renderer
with
create_frame() calls targeting to a proper surface.
See patch #5619
Modified:
trunk/client/gui-sdl2/citydlg.c
trunk/client/gui-sdl2/connectdlg.c
Modified: trunk/client/gui-sdl2/citydlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/citydlg.c?rev=27471&r1=27470&r2=27471&view=diff
==============================================================================
--- trunk/client/gui-sdl2/citydlg.c (original)
+++ trunk/client/gui-sdl2/citydlg.c Thu Jan 1 18:11:08 2015
@@ -3044,11 +3044,9 @@
fill_rect_alpha(pWindow->dst->surface, &dest,
get_theme_color(COLOR_THEME_CITYDLG_GRANARY));
-#if 0
- putframe(pWindow->dst->renderer,
- dest.x - 1, dest.y - 1, dest.x + dest.w, dest.y + dest.h,
- get_theme_color(COLOR_THEME_CITYDLG_FRAME));
-#endif
+ create_frame(pWindow->dst->surface,
+ dest.x - 1, dest.y - 1, dest.w, dest.h,
+ get_theme_color(COLOR_THEME_CITYDLG_FRAME));
/* draw bcgd stocks*/
dest.x = pWindow->size.x + adj_size(550);
@@ -3056,11 +3054,9 @@
fill_rect_alpha(pWindow->dst->surface, &dest,
get_theme_color(COLOR_THEME_CITYDLG_STOCKS));
-#if 0
- putframe(pWindow->dst->renderer,
- dest.x - 1, dest.y - 1, dest.x + dest.w, dest.y + dest.h,
- get_theme_color(COLOR_THEME_CITYDLG_FRAME));
-#endif
+ create_frame(pWindow->dst->surface,
+ dest.x - 1, dest.y - 1, dest.w, dest.h,
+ get_theme_color(COLOR_THEME_CITYDLG_FRAME));
/* draw stocks icons */
cost = city_granary_size(city_size_get(pCity));
@@ -3151,11 +3147,9 @@
fill_rect_alpha(pWindow->dst->surface, &dest,
get_theme_color(COLOR_THEME_CITYDLG_FOODSTOCK));
-#if 0
- putframe(pWindow->dst->renderer,
- dest.x - 1, dest.y - 1, dest.x + dest.w, dest.y + dest.h,
- get_theme_color(COLOR_THEME_CITYDLG_FRAME));
-#endif
+ create_frame(pWindow->dst->surface,
+ dest.x - 1, dest.y - 1, dest.w, dest.h,
+ get_theme_color(COLOR_THEME_CITYDLG_FRAME));
/* draw icons */
cost = city_granary_size(city_size_get(pCity));
@@ -3295,11 +3289,9 @@
fill_rect_alpha(pWindow->dst->surface, &dest,
get_theme_color(COLOR_THEME_CITYDLG_SHIELDSTOCK));
-#if 0
- putframe(pWindow->dst->renderer,
- dest.x - 1, dest.y - 1, dest.x + dest.w, dest.y + dest.h,
- get_theme_color(COLOR_THEME_CITYDLG_FRAME));
-#endif
+ create_frame(pWindow->dst->surface,
+ dest.x - 1, dest.y - 1, dest.w, dest.h,
+ get_theme_color(COLOR_THEME_CITYDLG_FRAME));
/* draw production progres text */
dest.y = pWindow->size.y + adj_size(270) + dest.h + 1;
Modified: trunk/client/gui-sdl2/connectdlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/connectdlg.c?rev=27471&r1=27470&r2=27471&view=diff
==============================================================================
--- trunk/client/gui-sdl2/connectdlg.c (original)
+++ trunk/client/gui-sdl2/connectdlg.c Thu Jan 1 18:11:08 2015
@@ -445,20 +445,16 @@
fill_rect_alpha(pWindow->dst->surface, &area2, &bg_color);
-#if 0
- putframe(pWindow->dst->renderer,
- area2.x - 1, area2.y - 1, area2.x + area2.w, area2.y + area2.h,
- get_theme_color(COLOR_THEME_CONNECTDLG_INNERFRAME));
-#endif
+ create_frame(pWindow->dst->surface,
+ area2.x - 1, area2.y - 1, area2.w, area2.h,
+ get_theme_color(COLOR_THEME_CONNECTDLG_INNERFRAME));
redraw_group(pMeta_Server->pBeginWidgetList, pWindow->prev, 0);
-#if 0
- putframe(pWindow->dst->renderer,
- pWindow->size.x, pWindow->size.y,
- area.x + area.w - 1, area.y + area.h - 1,
- get_theme_color(COLOR_THEME_CONNECTDLG_FRAME));
-#endif
+ create_frame(pWindow->dst->surface,
+ pWindow->size.x, pWindow->size.y,
+ area.w - 1, area.h - 1,
+ get_theme_color(COLOR_THEME_CONNECTDLG_FRAME));
widget_flush(pWindow);
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
