From 5843fa3ef10779bf674586b0484971aec809c1fc Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Mon, 27 Mar 2023 01:53:53 -0700 Subject: [PATCH] Menu-VGUI: Knew I forgot something. Thanks @Fix --- src/menu-vgui/ui_modelviewer.qc | 2 +- src/vgui/ui_window.qc | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/menu-vgui/ui_modelviewer.qc b/src/menu-vgui/ui_modelviewer.qc index 09f5fce2..35081317 100644 --- a/src/menu-vgui/ui_modelviewer.qc +++ b/src/menu-vgui/ui_modelviewer.qc @@ -247,7 +247,7 @@ void UI_ModelViewer_Show ( void ) winViewer.SetSize( [ 550, 390 ] ); winViewer.SetMinSize( [ 430, 256 ] ); winViewer.SetMaxSize( [ 9999, 9999 ] ); - winViewer.FlagAdd( WINDOW_CANRESIZE ); + winViewer.SetStyleMask( VGUIWindowStyleDefault ); winViewer.SetPos( [ 172, 64 ] ); winViewer.SetIcon( "textures/ui/icons/hdd" ); winViewer.CallOnResize( UI_ModelViewer_Resize ); diff --git a/src/vgui/ui_window.qc b/src/vgui/ui_window.qc index 5ab3c656..f3a328ff 100644 --- a/src/vgui/ui_window.qc +++ b/src/vgui/ui_window.qc @@ -30,6 +30,12 @@ typedef enumflags VGUIWindowMovable, } vguiWindowStyle_t; +#define VGUIWindowStyleDefault VGUIWindowMovable | \ + VGUIWindowTitled | \ + VGUIWindowClosable | \ + VGUIWindowMiniaturizable | \ + VGUIWindowResizeable + /** Top-most window class in VGUILib */ class VGUIWindow:VGUIWidget { @@ -79,11 +85,7 @@ VGUIWindow::VGUIWindow(void) { m_vecColor = UI_MAINCOLOR; m_flAlpha = 1.0f; - m_styleMask = VGUIWindowMovable | - VGUIWindowTitled | - VGUIWindowClosable | - VGUIWindowMiniaturizable | - VGUIWindowResizeable; + m_styleMask = VGUIWindowStyleDefault; } void