mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in convert_xmlelement_to_widget() setting maxwidth when only minwidth where specified.

Browse Source
This commit is contained in:
David Capello 2010-04-24 01:36:11 -03:00
parent 28074c0e0c
commit e12fd03b7b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jinete/jfile.cpp
View File

@ -358,14 +358,17 @@ static JWidget convert_xmlelement_to_widget(TiXmlElement* elem)
if (childspacing)
widget->child_spacing = ustrtol(childspacing, NULL, 10);
if (width || minwidth || maxwidth ||
height || minheight || maxheight) {
if (width || minwidth ||
height || minheight) {
int w = (width || minwidth) ? ustrtol(width ? width: minwidth, NULL, 10): 0;
int h = (height || minheight) ? ustrtol(height ? height: minheight, NULL, 10): 0;
jwidget_set_min_size(widget, w*jguiscale(), h*jguiscale());
}
w = (width || maxwidth) ? strtol(width ? width: maxwidth, NULL, 10): INT_MAX;
h = (height || maxheight) ? strtol(height ? height: maxheight, NULL, 10): INT_MAX;
if (width || maxwidth ||
height || maxheight) {
int w = (width || maxwidth) ? strtol(width ? width: maxwidth, NULL, 10): INT_MAX;
int h = (height || maxheight) ? strtol(height ? height: maxheight, NULL, 10): INT_MAX;
jwidget_set_max_size(widget, w*jguiscale(), h*jguiscale());
}