UI: Misc fixes... get 'base' building again
This commit is contained in:
parent
6982043380
commit
14518aabf0
|
@ -234,6 +234,7 @@ NSInteractiveSurface::Spawned(void)
|
||||||
|
|
||||||
/* initialize UI panel here */
|
/* initialize UI panel here */
|
||||||
m_UIChain = spawn(CUIWidget);
|
m_UIChain = spawn(CUIWidget);
|
||||||
|
m_UIChain.m_iFlags = 1;
|
||||||
|
|
||||||
child = UIClass_Spawn(m_strUIClass);
|
child = UIClass_Spawn(m_strUIClass);
|
||||||
|
|
||||||
|
@ -279,6 +280,8 @@ TestUI::TestTrigger(void)
|
||||||
void
|
void
|
||||||
TestUI::Spawned(void)
|
TestUI::Spawned(void)
|
||||||
{
|
{
|
||||||
|
super::Spawned();
|
||||||
|
|
||||||
testbutton = spawn(CUIButton);
|
testbutton = spawn(CUIButton);
|
||||||
testbutton.SetPos([32,48]);
|
testbutton.SetPos([32,48]);
|
||||||
testbutton.SetTitle("Test Button!");
|
testbutton.SetTitle("Test Button!");
|
||||||
|
|
|
@ -30,3 +30,5 @@ var float lasttime;
|
||||||
|
|
||||||
#define TARGET_MENU 1
|
#define TARGET_MENU 1
|
||||||
#define TARGET_CLIENT 2
|
#define TARGET_CLIENT 2
|
||||||
|
|
||||||
|
var vector g_vecMousePos;
|
||||||
|
|
|
@ -104,6 +104,8 @@ float Menu_InputEvent ( float evtype, float scanx, float chary, float devid )
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
g_vecMousePos = getmousepos();
|
||||||
|
|
||||||
g_uiDesktop.Input( evtype, scanx, chary, devid );
|
g_uiDesktop.Input( evtype, scanx, chary, devid );
|
||||||
return (float)g_iMenuActive;
|
return (float)g_iMenuActive;
|
||||||
}
|
}
|
||||||
|
|
|
@ -231,6 +231,7 @@ UISystem_Init(void)
|
||||||
precache_pic("textures/ui/steam/icon_close");
|
precache_pic("textures/ui/steam/icon_close");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CLIENT
|
||||||
CUIWidget
|
CUIWidget
|
||||||
UIClass_Spawn(string cname)
|
UIClass_Spawn(string cname)
|
||||||
{
|
{
|
||||||
|
@ -251,3 +252,4 @@ UIClass_Spawn(string cname)
|
||||||
|
|
||||||
return __NULL__;
|
return __NULL__;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -178,7 +178,6 @@ void CUIWindow::Show(void)
|
||||||
|
|
||||||
void CUIWindow::Draw(void)
|
void CUIWindow::Draw(void)
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifdef CLASSIC_VGUI
|
#ifdef CLASSIC_VGUI
|
||||||
drawfill(m_vecOrigin, m_vecSize, [0,0,0], 0.5);
|
drawfill(m_vecOrigin, m_vecSize, [0,0,0], 0.5);
|
||||||
drawfill(m_vecOrigin, [m_vecSize[0], 1], m_vecColor, 1.0f);
|
drawfill(m_vecOrigin, [m_vecSize[0], 1], m_vecColor, 1.0f);
|
||||||
|
|
Loading…
Reference in New Issue