(svn r5102) - Backport from trunk (r4753): 0.4
authorDarkvater
Sun, 04 Jun 2006 17:25:00 +0000
branch0.4
changeset 10026 1fd0bf7728c6
parent 10025 c904d781d751
child 10027 801e66bae005
(svn r5102) - Backport from trunk (r4753):
Truncate text in dropdown lists to stop text overflowing.
widget.c
--- a/widget.c	Fri Jun 02 13:23:22 2006 +0000
+++ b/widget.c	Sun Jun 04 17:25:00 2006 +0000
@@ -212,7 +212,7 @@
 			DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, FR_LOWERED | FR_DARKENED);
 
 			str = wi->unkA;
-			if (str != 0) DrawString(r.left + 2, r.top + 1, str, 0);
+			if (str != 0) DrawStringTruncated(r.left + 2, r.top + 1, str, 0, r.right - r.left - 10);
 			goto draw_default;
 		}
 
@@ -494,7 +494,7 @@
 				}
 				if (WP(w,dropdown_d).items[i] != 0) {
 					if (sel == 0) GfxFillRect(x + 1, y, x + w->width - 4, y + 9, 0);
-					DrawString(x + 2, y, WP(w,dropdown_d).items[i], sel == 0 ? 12 : 16);
+					DrawStringTruncated(x + 2, y, WP(w,dropdown_d).items[i], sel == 0 ? 12 : 16, w->width - 4);
 
 					if (HASBIT(WP(w,dropdown_d).disabled_state, i)) {
 						GfxFillRect(x, y, x + w->width - 3, y + 9,