github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

dev

Browse source
This commit is contained in:
Mirek Fidler 2025-05-29 10:44:13 +02:00
parent 713d5bd53e
commit f74ebf3952
2 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
examples/CustomTitlebar/main.cpp
View file

@ -16,6 +16,7 @@ struct MyApp : TopWindow {
} }
MenuBar bar; MenuBar bar;
LineEdit editor;
MyApp() { MyApp() {
CustomTitleBar(); CustomTitleBar();
@ -23,6 +24,8 @@ struct MyApp : TopWindow {
bar.Set([=](Bar& bar) { bar.Set([=](Bar& bar) {
MainMenu(bar); MainMenu(bar);
}); });
Add(editor.HSizePos().VSizePos(50, 0));
}; };
}; };

25
uppsrc/CtrlCore/Win32Proc.cpp
View file

@ -115,6 +115,29 @@ static int getTitlebarButtonWidth(int dpi)
int GetWin32TitleBarHeight(HWND hwnd); // implemented in CtrlLib/ChWin32.cpp int GetWin32TitleBarHeight(HWND hwnd); // implemented in CtrlLib/ChWin32.cpp
/* UHD
r = [0, 0] - [2854, 60] : (2854, 60)
button_width = 94
HD
r = [0, 0] - [1424, 31] : (1424, 31)
button_width = 47
Light
Bar 238 244 249
Min/max 230,234,239
Dark
bar 26,34,39
min/max 39,47,52
close 232,17,35
*/
static Rect getTitleBarRect(HWND hwnd) // TODO (image, cy) static Rect getTitleBarRect(HWND hwnd) // TODO (image, cy)
{ // Adopted from: https://github.com/oberth/custom-chrome/blob/master/source/gui/window_helper.hpp#L52-L64 { // Adopted from: https://github.com/oberth/custom-chrome/blob/master/source/gui/window_helper.hpp#L52-L64
const int top_and_bottom_borders = 2; const int top_and_bottom_borders = 2;
@ -134,8 +157,10 @@ void Ctrl::PaintWinBar(SystemDraw& w, const Rect& clip)
HWND hwnd = GetHWND(); HWND hwnd = GetHWND();
if(topwin && topwin->custom_titlebar && hwnd) { if(topwin && topwin->custom_titlebar && hwnd) {
Rect r = getTitleBarRect(hwnd); Rect r = getTitleBarRect(hwnd);
DDUMP(r);
// draw.DrawRect(r, Yellow()); // draw.DrawRect(r, Yellow());
int button_width = getTitlebarButtonWidth(GetDpiForWindow(hwnd)); int button_width = getTitlebarButtonWidth(GetDpiForWindow(hwnd));
DDUMP(button_width);
int x = r.right; int x = r.right;
int n = 0; int n = 0;