r2935 - in trunk/data/qcsrc/menu-div0test: . item nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-11-10 10:25:09 -0500 (Sat, 10 Nov 2007)
New Revision: 2935

Added:
   trunk/data/qcsrc/menu-div0test/baseinputbox_f.tga
   trunk/data/qcsrc/menu-div0test/baseinputbox_n.tga
Modified:
   trunk/data/qcsrc/menu-div0test/item/inputbox.c
   trunk/data/qcsrc/menu-div0test/item/inputcontainer.c
   trunk/data/qcsrc/menu-div0test/item/listbox.c
   trunk/data/qcsrc/menu-div0test/nexuiz/inputbox.c
   trunk/data/qcsrc/menu-div0test/skin.qh
Log:
fix bug in filter; add Morphed's inputbox


Added: trunk/data/qcsrc/menu-div0test/baseinputbox_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/qcsrc/menu-div0test/baseinputbox_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/qcsrc/menu-div0test/baseinputbox_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/qcsrc/menu-div0test/baseinputbox_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/qcsrc/menu-div0test/item/inputbox.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/inputbox.c	2007-11-10 15:00:08 UTC (rev 2934)
+++ trunk/data/qcsrc/menu-div0test/item/inputbox.c	2007-11-10 15:25:09 UTC (rev 2935)
@@ -92,7 +92,10 @@
 			}
 			return 1;
 		case K_DEL:
-			me.setText(me, strcat(substring(me.text, 0, me.cursorPos), substring(me.text, me.cursorPos + 1, strlen(me.text) - me.cursorPos - 1)));
+			if(shift)
+				me.setText(me, "");
+			else
+				me.setText(me, strcat(substring(me.text, 0, me.cursorPos), substring(me.text, me.cursorPos + 1, strlen(me.text) - me.cursorPos - 1)));
 			return 1;
 	}
 	return 0;

Modified: trunk/data/qcsrc/menu-div0test/item/inputcontainer.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/inputcontainer.c	2007-11-10 15:00:08 UTC (rev 2934)
+++ trunk/data/qcsrc/menu-div0test/item/inputcontainer.c	2007-11-10 15:25:09 UTC (rev 2935)
@@ -18,10 +18,12 @@
 void resizeNotifyInputContainer(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
 	resizeNotifyContainer(me, relOrigin, relSize, absOrigin, absSize);
+	/*
 	if(me.parent.instanceOfInputContainer)
 		me.isTabRoot = 0;
 	else
 		me.isTabRoot = 1;
+	*/
 }
 
 void focusLeaveInputContainer(entity me)

Modified: trunk/data/qcsrc/menu-div0test/item/listbox.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/listbox.c	2007-11-10 15:00:08 UTC (rev 2934)
+++ trunk/data/qcsrc/menu-div0test/item/listbox.c	2007-11-10 15:25:09 UTC (rev 2935)
@@ -50,11 +50,8 @@
 }
 float keyDownListBox(entity me, float key, float ascii, float shift)
 {
-	if(key == K_DOWNARROW)
-		me.selectedItem += 1;
-	else if(key == K_UPARROW)
-		me.selectedItem -= 1;
-	else if(key == K_MWHEELUP)
+	me.dragScrollTimer = 0;
+	if(key == K_MWHEELUP)
 	{
 		me.scrollPos = max(me.scrollPos - 0.5, 0);
 		me.setSelected(me, min(me.selectedItem, floor((me.scrollPos + 1) / me.itemHeight - 1)));
@@ -68,6 +65,10 @@
 		me.setSelected(me, me.selectedItem - 1 / me.itemHeight);
 	else if(key == K_PGDN)
 		me.setSelected(me, me.selectedItem + 1 / me.itemHeight);
+	else if(key == K_UPARROW)
+		me.setSelected(me, me.selectedItem - 1);
+	else if(key == K_DOWNARROW)
+		me.setSelected(me, me.selectedItem + 1);
 	else if(key == K_HOME)
 		me.setSelected(me, 0);
 	else if(key == K_END)
@@ -118,6 +119,7 @@
 	if(pos_y >= 1) return 0;
 	me.dragScrollPos = pos;
 	me.updateControlTopBottom(me);
+	me.dragScrollTimer = 0;
 	if(pos_x >= 1 - me.controlWidth)
 	{
 		// if hit, set me.pressed, otherwise scroll by one page

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/inputbox.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/inputbox.c	2007-11-10 15:00:08 UTC (rev 2934)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/inputbox.c	2007-11-10 15:25:09 UTC (rev 2935)
@@ -7,6 +7,8 @@
 	ATTRIB(NexuizInputBox, image, string, SKINGFX_INPUTBOX)
 	ATTRIB(NexuizInputBox, onChange, void(entity, entity), SUB_Null)
 	ATTRIB(NexuizInputBox, onChangeEntity, entity, NULL)
+	ATTRIB(NexuizInputBox, keepspaceLeft, float, SKINMARGIN_INPUTBOX)
+	ATTRIB(NexuizInputBox, keepspaceRight, float, SKINMARGIN_INPUTBOX)
 
 	ATTRIB(NexuizInputBox, cvarName, string, string_null)
 	METHOD(NexuizInputBox, loadCvars, void(entity))

Modified: trunk/data/qcsrc/menu-div0test/skin.qh
===================================================================
--- trunk/data/qcsrc/menu-div0test/skin.qh	2007-11-10 15:00:08 UTC (rev 2934)
+++ trunk/data/qcsrc/menu-div0test/skin.qh	2007-11-10 15:25:09 UTC (rev 2935)
@@ -10,12 +10,13 @@
 const string SKINGFX_COLORBUTTON = "qcsrc/menu-div0test/basebutton";
 const string SKINGFX_COLORBUTTON_COLOR = "qcsrc/menu-div0test/color";
 const string SKINGFX_SCROLLBAR = "qcsrc/menu-div0test/basescrollbar";
-const string SKINGFX_INPUTBOX = "qcsrc/menu-div0test/basebuttongray";
+const string SKINGFX_INPUTBOX = "qcsrc/menu-div0test/baseinputbox";
 
 const float SKINMARGIN_TOP = 8;
 const float SKINMARGIN_LEFT = 8;
 const float SKINMARGIN_COLUMNS = 4;
 const float SKINMARGIN_ROWS = 4;
+const float SKINMARGIN_INPUTBOX = 0.01;
 
 const float SKINFONTSIZE_NORMAL = 12;
 const float SKINHEIGHT_NORMAL = 1.5;