upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 15:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #9025 (XP & HP bars not zoomed)

Browse Source 
* adjust height bar with zoom()

* use SCALED_TO_ZOOM for orbs and bars (like other unit stuff)

PS: At high zoom level, sometimes the inner part of the bar doesn't
fit exactly the rectangle. I think it's slight and caused by this
strange design choice to get rectangle's coordinates from an image
file.
This commit is contained in:
Ali El Gariani 2007-04-29 15:39:52 +00:00
parent 0d153e13d0
commit 1c5d5f5b71
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/display.cpp
View File

@ -1356,13 +1356,14 @@ void display::draw_minimap(int x, int y, int w, int h)
update_rect(minimap_location); update_rect(minimap_location);
} }
void display::draw_bar(const std::string& image, int xpos, int ypos, size_t height, double filled, const SDL_Color& col, fixed_t alpha) void display::draw_bar(const std::string& image, int xpos, int ypos, size_t height, double filled, const SDL_Color& col, fixed_t alpha)
{ {
filled = minimum<double>(maximum<double>(filled,0.0),1.0); filled = minimum<double>(maximum<double>(filled,0.0),1.0);
height = static_cast<size_t>(height*zoom());
surface surf(image::get_image(image,image::SCALED_TO_HEX,image::NO_ADJUST_COLOUR)); surface surf(image::get_image(image,image::SCALED_TO_ZOOM,image::NO_ADJUST_COLOUR));
// we use UNSCALED because scaling (and bilinear interpolaion )
// is bad for calculate_energy_bar. But we will do a geometric scaling later
surface unmoved_surf(image::get_image("misc/bar-energy-unmoved.png",image::UNSCALED,image::NO_ADJUST_COLOUR)); surface unmoved_surf(image::get_image("misc/bar-energy-unmoved.png",image::UNSCALED,image::NO_ADJUST_COLOUR));
if(surf == NULL || unmoved_surf == NULL) { if(surf == NULL || unmoved_surf == NULL) {
return; return;
@ -1380,7 +1381,7 @@ void display::draw_bar(const std::string& image, int xpos, int ypos, size_t heig
const fixed_t yratio = fxpdiv(surf->h,unmoved_surf->h); const fixed_t yratio = fxpdiv(surf->h,unmoved_surf->h);
const SDL_Rect scaled_bar_loc = {fxptoi(unscaled_bar_loc. x * xratio), const SDL_Rect scaled_bar_loc = {fxptoi(unscaled_bar_loc. x * xratio),
fxptoi(unscaled_bar_loc. y * yratio + 127), fxptoi(unscaled_bar_loc. y * yratio + 127),
fxptoi(unscaled_bar_loc. w * yratio + 255), fxptoi(unscaled_bar_loc. w * xratio + 255),
fxptoi(unscaled_bar_loc. h * yratio + 255)}; fxptoi(unscaled_bar_loc. h * yratio + 255)};
bar_loc = scaled_bar_loc; bar_loc = scaled_bar_loc;
} }