From 74c8d33a2b830a47c31272bcf16cbbfd404ce0e8 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Thu, 8 Nov 2007 00:05:14 +0000
Subject: * Merge and move text paint functions into ui_shared.c * Add
 aspectBias to indicate alignment on non-4:3 video modes * Add "reset <item>"
 script command to reset an item * Compensate for aspect ratio in lots and
 lots and lots of places * Release edit field focus when tabbing away * Fix
 infinite loop bug in text wrapping code when rect is very narrow * Mung .menu
 scripts to line things up correctly on non-4:3 ratios

---
 ui/findplayer.menu | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'ui/findplayer.menu')

diff --git a/ui/findplayer.menu b/ui/findplayer.menu
index d78dede2..09d715a4 100644
--- a/ui/findplayer.menu
+++ b/ui/findplayer.menu
@@ -28,8 +28,7 @@
     onClose { }
     onOpen
     {
-      uiScript FindPlayer;
-      setfocus namefield
+      uiScript FindPlayer
     }
 
     onESC
@@ -60,8 +59,8 @@
       cvar "ui_findplayer"
       maxChars 20
       rect BORDER BORDER (W-((2*BORDER)+BUTT_W)) SEARCH_H
-      textalign ITEM_ALIGN_LEFT
-      textvalign ITEM_VALIGN_CENTER
+      textalign ALIGN_LEFT
+      textvalign VALIGN_CENTER
       textscale .3
       outlinecolor .2 .2 .2 .5
       backcolor 0 0 0 0
@@ -80,8 +79,8 @@
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
       rect (W-(BORDER+BUTT_W)) BORDER BUTT_W SEARCH_H
-      textalign ITEM_ALIGN_CENTER
-      textvalign ITEM_VALIGN_CENTER
+      textalign ALIGN_CENTER
+      textvalign VALIGN_CENTER
       forecolor 1 1 1 1
       visible MENU_TRUE
       action
@@ -127,10 +126,10 @@
       notselectable
       visible MENU_TRUE
       columns 4
-        0                     ((2*LEFT_C)*LIST_DW) ITEM_ALIGN_LEFT
-        (LEFT_C*LIST_DW)      (LEFT_C*LIST_DW)     ITEM_ALIGN_LEFT
-        ((2*LEFT_C)*LIST_DW)  (LEFT_C*LIST_DW)     ITEM_ALIGN_LEFT
-        ((1-RIGHT_C)*LIST_DW) (RIGHT_C*LIST_DW)    ITEM_ALIGN_LEFT
+        0                     ((2*LEFT_C)*LIST_DW) ALIGN_LEFT
+        (LEFT_C*LIST_DW)      (LEFT_C*LIST_DW)     ALIGN_LEFT
+        ((2*LEFT_C)*LIST_DW)  (LEFT_C*LIST_DW)     ALIGN_LEFT
+        ((1-RIGHT_C)*LIST_DW) (RIGHT_C*LIST_DW)    ALIGN_LEFT
     }
 
     //  BUTTON  //
@@ -143,8 +142,8 @@
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
       rect (W-(2*BUTT_W)) (H-BUTT_H) BUTT_W BUTT_H
-      textalign ITEM_ALIGN_CENTER
-      textvalign ITEM_VALIGN_CENTER
+      textalign ALIGN_CENTER
+      textvalign VALIGN_CENTER
       forecolor 1 1 1 1
       visible MENU_TRUE
       action { ui_script FoundPlayerJoinServer }
@@ -158,8 +157,8 @@
       type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
       rect (W-BUTT_W) (H-BUTT_H) BUTT_W BUTT_H
-      textalign ITEM_ALIGN_CENTER
-      textvalign ITEM_VALIGN_CENTER
+      textalign ALIGN_CENTER
+      textvalign VALIGN_CENTER
       forecolor 1 1 1 1
       visible MENU_TRUE
       action
-- 
cgit