Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwsetup-ng.git;a=commitdiff;h=a07572c79be2e70d48293996012f2dbd01cc570a
commit a07572c79be2e70d48293996012f2dbd01cc570a Author: James Buren <[email protected]> Date: Sat Aug 18 23:17:46 2012 -0500 some tweaks to get_text_size() diff --git a/Utility.cc b/Utility.cc index 728a1c3..aecfce4 100644 --- a/Utility.cc +++ b/Utility.cc @@ -70,8 +70,7 @@ bool get_text_size(const string &text,int &width,int &height) break; default: - i = wcwidth(wc); - if(i > 0) + if((i = wcwidth(wc)) > 0) cw += i; break; } @@ -79,10 +78,8 @@ bool get_text_size(const string &text,int &width,int &height) off += n; } - if(w == 0 && cw > 0) - w = cw; - else if(w == 0) - w = 1; + if(w == 0) + w = (cw > 0) ? cw : 1; if(h == 0) h = 1; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
