c/webui
1
0
Fork 0
mirror of https://github.com/webui-dev/webui synced 2025-03-28 21:13:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #487 from testdrive-profiling-master/main

Browse Source 
add setting of minimum window size & default user icon patching. (currently windows only)
This commit is contained in:
Hassan DRAGA 2024-10-06 17:00:43 -04:00 committed by GitHub
commit cf0c54e2bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/webui.h
View File

@ -567,6 +567,17 @@ WEBUI_EXPORT void webui_set_hide(size_t window, bool status);
*/
WEBUI_EXPORT void webui_set_size(size_t window, unsigned int width, unsigned int height);
/**
* @brief Set the window minimum size.
*
* @param window The window number
* @param width The window width
* @param height The window height
*
* @example webui_set_minimum_size(myWindow, 800, 600);
*/
WEBUI_EXPORT void webui_set_minimum_size(size_t window, unsigned int width, unsigned int height);
/**
* @brief Set the window position.
*

5
include/webui.hpp
View File

@ -263,6 +263,11 @@ namespace webui {
webui_set_size(webui_window, width, height);
}
// Set window minimum size (currently windows only.)
void set_minimum_size(unsigned int width, unsigned int height) const {
webui_set_minimum_size(webui_window, width, height);
}
// Get the network port of a running window. This can be useful to determine the HTTP link of `webui.js`
size_t get_port() const {
return webui_get_port(webui_window);

48
src/webui.c
View File

@ -324,6 +324,9 @@ typedef struct _webui_window_t {
int width;
int height;
bool size_set;
int minimum_width;
int minimum_height;
bool minimum_size_set;
int x;
int y;
bool position_set;
@ -2518,6 +2521,32 @@ void webui_set_size(size_t window, unsigned int width, unsigned int height) {
}
}
void webui_set_minimum_size(size_t window, unsigned int width, unsigned int height) {
#ifdef WEBUI_LOG
printf("[User] webui_set_minimum_size(%zu, %u, %u)\n", window, width, height);
#endif
// Initialization
_webui_init();
// Dereference
if (_webui_mutex_is_exit_now(WEBUI_MUTEX_NONE) || _webui.wins[window] == NULL)
return;
_webui_window_t* win = _webui.wins[window];
if (width < WEBUI_MIN_WIDTH || width > WEBUI_MAX_WIDTH || height < WEBUI_MIN_HEIGHT ||
height > WEBUI_MAX_HEIGHT) {
win->minimum_size_set = false;
return;
}
win->minimum_width = width;
win->minimum_height = height;
win->minimum_size_set = true;
}
void webui_set_position(size_t window, unsigned int x, unsigned int y) {
#ifdef WEBUI_LOG
@ -10236,6 +10265,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) {
}
}
break;
case WM_GETMINMAXINFO:
if (win) {
if (win->minimum_size_set) {
LPMINMAXINFO lpMMI = (LPMINMAXINFO)lParam;
lpMMI->ptMinTrackSize.x = win->minimum_width;
lpMMI->ptMinTrackSize.y = win->minimum_height;
}
}
break;
case WM_CLOSE:
if (win) {
// Stop the WebView thread, close the window
@ -10447,7 +10485,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) {
wc.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
wc.hIcon = LoadIcon(NULL, IDI_APPLICATION);
wc.hIcon = LoadIcon(GetModuleHandle(NULL) ,MAKEINTRESOURCE(101)); // default user icon resouce : 101
if(!wc.hIcon) wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); // if not existed, use system default icon
if (!RegisterClassA(&wc) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) {
_webui_wv_free(win->webView);
@ -10463,6 +10502,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) {
NULL, NULL, GetModuleHandle(NULL), NULL
);
{ // window size correction
RECT rc;
GetClientRect(win->webView->hwnd, &rc);
win->webView->width = rc.right - rc.left;
win->webView->height = rc.bottom - rc.top;
}
if (!win->webView->hwnd) {
_webui_wv_free(win->webView);
win->webView = NULL;