diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-08-25 07:21:17 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-08-25 07:21:17 +0200 |
| commit | fa6cc3970bc61e8061a279e8573a61bd4e947f2f (patch) | |
| tree | b5b4d0ab651c8cff78b48a062a3ca432ecd035b1 /dev | |
| parent | 753947b7874c7b0589d823a44a69de8530948c30 (diff) | |
[FIX] Fix button text layout, working on setup wizard.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ZKA/Modules/CoreCG/WindowRenderer.hxx | 2 | ||||
| -rw-r--r-- | dev/ZKA/Sources/DLLMain.cxx | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/dev/ZKA/Modules/CoreCG/WindowRenderer.hxx b/dev/ZKA/Modules/CoreCG/WindowRenderer.hxx index 16e4c14c..52031e1d 100644 --- a/dev/ZKA/Modules/CoreCG/WindowRenderer.hxx +++ b/dev/ZKA/Modules/CoreCG/WindowRenderer.hxx @@ -146,7 +146,7 @@ namespace CG { CGDrawInRegion(CGColor(0xD3, 0x74, 0x00), wnd[index]->w_w + 1, wnd[index]->w_h + 1, wnd[index]->w_y, wnd[index]->w_x); CGDrawInRegion(CGColor(0xFF, 0xFF, 0xFF), wnd[index]->w_w - 1, wnd[index]->w_h - 1, wnd[index]->w_y + 1, wnd[index]->w_x + 1); - CGDrawString(wnd[index]->w_window_name, wnd[index]->w_y + (wnd[index]->w_y / 2) - 1, wnd[index]->w_x + (wnd[index]->w_x / 2), CGColor(0x00, 0x00, 0x00)); + CGDrawString(wnd[index]->w_window_name, wnd[index]->w_y + (wnd[index]->w_y / 2) - (wnd[index]->w_h / 2), wnd[index]->w_x + (wnd[index]->w_x / 2), CGColor(0x00, 0x00, 0x00)); } CGFini(); diff --git a/dev/ZKA/Sources/DLLMain.cxx b/dev/ZKA/Sources/DLLMain.cxx index 77e338b3..b3bcd48c 100644 --- a/dev/ZKA/Sources/DLLMain.cxx +++ b/dev/ZKA/Sources/DLLMain.cxx @@ -205,11 +205,19 @@ EXTERN_C Kernel::Void ke_dll_entrypoint(Kernel::Void) root_zka_wnd->w_needs_repaint = Yes; - CG::CGDrawWindowList(&root_zka_wnd, 1); - /// Now run kernel loop, until no process are running. Kernel::Detail::FilesystemInstaller(); // automatic filesystem creation. + auto root_install_wnd = CG::CGCreateWindow(CG::cWndFlagButton, "Install ZKA.", "Button", 0, 0, 128, 32); + + root_install_wnd->w_x = 30; + root_install_wnd->w_y = 60; + + root_install_wnd->w_needs_repaint = Yes; + + CG::CGDrawWindowList(&root_zka_wnd, 1); + CG::CGDrawWindowList(&root_install_wnd, 1); + /// @note BThread doesn't parse the symbols so doesn't nullify them, .bss is though. Kernel::cProcessScheduler = nullptr; |