80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Move machine information to the toolbar

Browse Source
This commit is contained in:
David Hrdlička
2022-01-09 19:12:08 +01:00
parent 929ee51234
commit e5b56e8820
2 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/win/win_toolbar.c
View File

@@ -5,6 +5,7 @@
#include <Windows.h> #include <Windows.h>
#include <CommCtrl.h> #include <CommCtrl.h>
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/plat.h>
#include <86box/resource.h> #include <86box/resource.h>
#include <86box/ui.h> #include <86box/ui.h>
#include <86box/win.h> #include <86box/win.h>
@@ -12,6 +13,7 @@
HWND hwndRebar; HWND hwndRebar;
static HWND hwndToolbar; static HWND hwndToolbar;
static HIMAGELIST hImageList; static HIMAGELIST hImageList;
static wchar_t wTitle[512];
static TBBUTTON buttons[] = { static TBBUTTON buttons[] = {
{ 0, IDM_ACTION_PAUSE, TBSTATE_ENABLED, BTNS_BUTTON, { 0 }, 0, 0 }, // Pause { 0, IDM_ACTION_PAUSE, TBSTATE_ENABLED, BTNS_BUTTON, { 0 }, 0, 0 }, // Pause
@@ -61,8 +63,7 @@ ToolBarCreate(HWND hwndParent, HINSTANCE hInst)
hwndRebar = CreateWindowEx(0, REBARCLASSNAME, NULL, hwndRebar = CreateWindowEx(0, REBARCLASSNAME, NULL,
WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
WS_CLIPCHILDREN | RBS_VARHEIGHT | WS_CLIPCHILDREN | RBS_VARHEIGHT |
RBS_BANDBORDERS | CCS_NODIVIDER | CCS_NODIVIDER | CCS_NOPARENTALIGN,
CCS_NOPARENTALIGN,
0, 0, 0, 0, 0, 0, 0, 0,
hwndParent, NULL, hInst, NULL); hwndParent, NULL, hInst, NULL);
@@ -72,14 +73,43 @@ ToolBarCreate(HWND hwndParent, HINSTANCE hInst)
// Add the toolbar to the rebar. // Add the toolbar to the rebar.
rbbi.cbSize = sizeof(rbbi); rbbi.cbSize = sizeof(rbbi);
rbbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE; rbbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_STYLE;
rbbi.hwndChild = hwndToolbar; rbbi.hwndChild = hwndToolbar;
rbbi.cxMinChild = 0; rbbi.cxMinChild = 0;
rbbi.cyMinChild = btnSize; rbbi.cyMinChild = btnSize;
rbbi.fStyle = RBBS_NOGRIPPER;
SendMessage(hwndRebar, RB_INSERTBAND, -1, (LPARAM)&rbbi); SendMessage(hwndRebar, RB_INSERTBAND, -1, (LPARAM)&rbbi);
SendMessage(hwndRebar, RB_MAXIMIZEBAND, 0, 0);
// Add a label for machine information.
rbbi.fMask = RBBIM_TEXT | RBBIM_STYLE;
rbbi.lpText = TEXT("Test");
rbbi.fStyle = RBBS_NOGRIPPER;
SendMessage(hwndRebar, RB_INSERTBAND, -1, (LPARAM)&rbbi);
SendMessage(hwndRebar, RB_MAXIMIZEBAND, 0, 0);
ShowWindow(hwndRebar, TRUE); ShowWindow(hwndRebar, TRUE);
return; return;
} }
wchar_t *
ui_window_title(wchar_t *s)
{
REBARBANDINFO rbbi = { 0 };
if (! video_fullscreen) {
if (s != NULL) {
wcsncpy(wTitle, s, sizeof_w(wTitle) - 1);
} else
s = wTitle;
rbbi.cbSize = sizeof(rbbi);
rbbi.fMask = RBBIM_TEXT;
rbbi.lpText = s;
SendMessage(hwndRebar, RB_SETBANDINFO, 1, (LPARAM) &rbbi);
} else {
if (s == NULL)
s = wTitle;
}
return(s);
}

22
src/win/win_ui.c
View File

@@ -74,7 +74,6 @@ extern WCHAR wopenfilestring[512];
/* Local data. */ /* Local data. */
static wchar_t wTitle[512];
static int manager_wm = 0; static int manager_wm = 0;
static int save_window_pos = 0, pause_state = 0; static int save_window_pos = 0, pause_state = 0;
static int padded_frame = 0; static int padded_frame = 0;
@@ -1328,7 +1327,7 @@ ui_init(int nCmdShow)
return(2); return(2);
/* Now create our main window. */ /* Now create our main window. */
mbstowcs(title, emu_version, sizeof_w(title)); swprintf_s(title, sizeof_w(title), L"%hs - %hs", vm_name, EMU_NAME);
hwnd = CreateWindowEx ( hwnd = CreateWindowEx (
0, /* no extended possibilites */ 0, /* no extended possibilites */
CLASS_NAME, /* class name */ CLASS_NAME, /* class name */
@@ -1560,25 +1559,6 @@ ui_init(int nCmdShow)
} }
wchar_t *
ui_window_title(wchar_t *s)
{
if (! video_fullscreen) {
if (s != NULL) {
wcsncpy(wTitle, s, sizeof_w(wTitle) - 1);
} else
s = wTitle;
SetWindowText(hwndMain, s);
} else {
if (s == NULL)
s = wTitle;
}
return(s);
}
/* We should have the language ID as a parameter. */ /* We should have the language ID as a parameter. */
void void
plat_pause(int p) plat_pause(int p)