qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-04 08:25:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

[win] Set window style correctly

Browse source 
This fixes the incorrectly sized window (I think).
This commit is contained in:
Bill Currie 2023-11-25 21:03:51 +09:00
parent ed3afeed39
commit 30489e1812
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/in_win.h
View file

@ -32,7 +32,6 @@
extern bool mouseactive;
extern float mouse_x, mouse_y;
extern unsigned uiWheelMessage;
void IN_Win_Preinit (void);
void IN_UpdateClipCursor (void);

21
libs/video/targets/context_win.c
View file

@ -537,16 +537,7 @@ Win_SetVidMode (int width, int height)
force_mode_set = false;
vid_realmode = vid_modenum;
}
#if 0
static void
VID_DestroyWindow (void)
{
if (modestate == MS_FULLDIB)
ChangeDisplaySettings (NULL, CDS_FULLSCREEN);
Win_UnloadAllDrivers ();
}
#endif
static void
VID_CheckModedescFixup (int mode)
{
@ -876,8 +867,8 @@ notify_destroy (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
static long
notify_move (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
win_pos_x = LOWORD (lParam);
win_pos_y = HIWORD (lParam);
win_pos_x = (short) LOWORD (lParam);
win_pos_y = (short) HIWORD (lParam);
Sys_MaskPrintf (SYS_vid, "notify_move: %d %d\n", win_pos_x, win_pos_y);
Win_UpdateWindowStatus ();
return 1;
@ -886,8 +877,8 @@ notify_move (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
static long
notify_size (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
win_len_x = LOWORD (lParam);
win_len_y = HIWORD (lParam);
win_len_x = (short) LOWORD (lParam);
win_len_y = (short) HIWORD (lParam);
Sys_MaskPrintf (SYS_vid, "notify_size: %d %d\n", win_pos_x, win_pos_y);
Win_UpdateWindowStatus ();
return 1;
@ -910,6 +901,8 @@ Win_CreateWindow (int width, int height)
.right = win_len_x = width,
.bottom = win_len_y = height,
};
WindowStyle = WS_OVERLAPPEDWINDOW | WS_CAPTION | WS_SYSMENU | WS_SIZEBOX |
WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
AdjustWindowRectEx (&rect, WindowStyle, FALSE, 0);
// sound initialization has to go here, preceded by a windowed mode set,
// so there's a window for DirectSound to work with but we're not yet
@ -919,7 +912,7 @@ Win_CreateWindow (int width, int height)
win_mainwindow = CreateWindowExA (ExWindowStyle,
WINDOW_CLASS,
PACKAGE_STRING,
WS_OVERLAPPEDWINDOW,
WindowStyle,
0, 0,
rect.right - rect.left,
rect.bottom - rect.top,