Author: mordante
Date: Sun May 18 16:08:54 2008
New Revision: 26697
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26697&view=rev
Log:
Fix an off by one error, this allows the background of the listbox to have no
gaps.
Modified:
trunk/data/gui/default/window/language_selection.cfg
trunk/src/gui/widgets/helper.cpp
Modified: trunk/data/gui/default/window/language_selection.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/gui/default/window/language_selection.cfg?rev=26697&r1=26696&r2=26697&view=diff
==============================================================================
--- trunk/data/gui/default/window/language_selection.cfg (original)
+++ trunk/data/gui/default/window/language_selection.cfg Sun May 18 16:08:54
2008
@@ -76,9 +76,6 @@
[row]
[column]
- # FIXME
we want no border but that is broken atm.
- border
= "all"
-
border_size = 1
grow_factor = 1
horizontal_grow = "true"
Modified: trunk/src/gui/widgets/helper.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/helper.cpp?rev=26697&r1=26696&r2=26697&view=diff
==============================================================================
--- trunk/src/gui/widgets/helper.cpp (original)
+++ trunk/src/gui/widgets/helper.cpp Sun May 18 16:08:54 2008
@@ -116,8 +116,8 @@
{
assert(background);
assert((background->flags & SDL_RLEACCEL) == 0);
- assert(rect.x + rect.w < background->w);
- assert(rect.y + rect.h < background->h);
+ assert(rect.x + rect.w <= background->w);
+ assert(rect.y + rect.h <= background->h);
surface result(SDL_CreateRGBSurface(SDL_SWSURFACE,
rect.w, rect.h, 32, 0xFF0000, 0xFF00, 0xFF, 0xFF000000));
@@ -151,8 +151,8 @@
assert(restorer);
assert((background->flags & SDL_RLEACCEL) == 0);
assert((restorer->flags & SDL_RLEACCEL) == 0);
- assert(rect.x + rect.w < background->w);
- assert(rect.y + rect.h < background->h);
+ assert(rect.x + rect.w <= background->w);
+ assert(rect.y + rect.h <= background->h);
{
// Extra scoping used for the surface_lock.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
