interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quick and dirty C++ conversions of box.c, tab.c, and window.c. I feel like I need another rewrite...

This commit is contained in:
Pietro Gagliardi 2016-04-23 11:22:46 -04:00
parent ff096410a8
commit fbef804608
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
windows/box.c → windows/box.cpp
View File

@ -1,5 +1,7 @@
// 7 april 2015 // 7 april 2015
#include "uipriv_windows.h" #include "uipriv_windows.hpp"
// TODO C++-ize
struct uiBox { struct uiBox {
uiWindowsControl c; uiWindowsControl c;

6
windows/tab.c → windows/tab.cpp
View File

@ -1,5 +1,5 @@
// 16 may 2015 // 16 may 2015
#include "uipriv_windows.h" #include "uipriv_windows.hpp"
// TODO // TODO
// - write comment here about how tabs and parents work // - write comment here about how tabs and parents work
@ -191,7 +191,7 @@ void uiTabInsertAt(uiTab *t, const char *name, uintmax_t n, uiControl *child)
wname = toUTF16(name); wname = toUTF16(name);
item.pszText = wname; item.pszText = wname;
if (SendMessageW(t->hwnd, TCM_INSERTITEM, (WPARAM) n, (LPARAM) (&item)) == (LRESULT) -1) if (SendMessageW(t->hwnd, TCM_INSERTITEM, (WPARAM) n, (LPARAM) (&item)) == (LRESULT) -1)
logLastError("error adding tab to uiTab in uiTabInsertAt()"); logLastError(L"error adding tab to uiTab");
uiFree(wname); uiFree(wname);
// we need to do this because adding the first tab doesn't send a TCN_SELCHANGE; it just shows the page // we need to do this because adding the first tab doesn't send a TCN_SELCHANGE; it just shows the page
@ -209,7 +209,7 @@ void uiTabDelete(uiTab *t, uintmax_t n)
// first delete the tab from the tab control // first delete the tab from the tab control
// if this is the current tab, no tab will be selected, which is good // if this is the current tab, no tab will be selected, which is good
if (SendMessageW(t->hwnd, TCM_DELETEITEM, (WPARAM) n, 0) == FALSE) if (SendMessageW(t->hwnd, TCM_DELETEITEM, (WPARAM) n, 0) == FALSE)
logLastError("error deleting uiTab tab in tabDelete()"); logLastError(L"error deleting uiTab tab");
// now delete the page itself // now delete the page itself
page = ptrArrayIndex(t->pages, struct child *, n); page = ptrArrayIndex(t->pages, struct child *, n);

18
windows/window.c → windows/window.cpp
View File

@ -1,5 +1,5 @@
// 27 april 2015 // 27 april 2015
#include "uipriv_windows.h" #include "uipriv_windows.hpp"
#define windowClass L"libui_uiWindowClass" #define windowClass L"libui_uiWindowClass"
@ -102,7 +102,7 @@ ATOM registerWindowClass(HICON hDefaultIcon, HCURSOR hDefaultCursor)
void unregisterWindowClass(void) void unregisterWindowClass(void)
{ {
if (UnregisterClassW(windowClass, hInstance) == 0) if (UnregisterClassW(windowClass, hInstance) == 0)
logLastError("error unregistering uiWindow window class in unregisterWindowClass()"); logLastError(L"error unregistering uiWindow window class");
} }
static int defaultOnClosing(uiWindow *w, void *data) static int defaultOnClosing(uiWindow *w, void *data)
@ -137,7 +137,7 @@ static void windowCommitShow(uiControl *c)
uiWindowsControlQueueRelayout(uiWindowsControl(w)); uiWindowsControlQueueRelayout(uiWindowsControl(w));
ShowWindow(w->hwnd, nCmdShow); ShowWindow(w->hwnd, nCmdShow);
if (UpdateWindow(w->hwnd) == 0) if (UpdateWindow(w->hwnd) == 0)
logLastError("error calling UpdateWindow() after showing uiWindow for the first time in windowShow()"); logLastError(L"error calling UpdateWindow() after showing uiWindow for the first time");
} }
static void windowContainerUpdateState(uiControl *c) static void windowContainerUpdateState(uiControl *c)
@ -243,7 +243,7 @@ static void setClientSize(uiWindow *w, int width, int height, BOOL hasMenubar, D
window.right = width; window.right = width;
window.bottom = height; window.bottom = height;
if (AdjustWindowRectEx(&window, style, hasMenubar, exstyle) == 0) if (AdjustWindowRectEx(&window, style, hasMenubar, exstyle) == 0)
logLastError("error getting real window coordinates in setClientSize()"); logLastError(L"error getting real window coordinates");
if (hasMenubar) { if (hasMenubar) {
RECT temp; RECT temp;
@ -253,7 +253,7 @@ static void setClientSize(uiWindow *w, int width, int height, BOOL hasMenubar, D
window.bottom += temp.top; window.bottom += temp.top;
} }
if (SetWindowPos(w->hwnd, NULL, 0, 0, window.right - window.left, window.bottom - window.top, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER) == 0) if (SetWindowPos(w->hwnd, NULL, 0, 0, window.right - window.left, window.bottom - window.top, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER) == 0)
logLastError("error resizing window in setClientSize()"); logLastError(L"error resizing window");
} }
uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar) uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
@ -283,13 +283,13 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
width, height, width, height,
NULL, NULL, hInstance, w); NULL, NULL, hInstance, w);
if (w->hwnd == NULL) if (w->hwnd == NULL)
logLastError("error creating window in uiWindow()"); logLastError(L"error creating window");
uiFree(wtitle); uiFree(wtitle);
if (hasMenubar) { if (hasMenubar) {
w->menubar = makeMenubar(); w->menubar = makeMenubar();
if (SetMenu(w->hwnd, w->menubar) == 0) if (SetMenu(w->hwnd, w->menubar) == 0)
logLastError("error giving menu to window in uiNewWindow()"); logLastError(L"error giving menu to window");
} }
// and use the proper size // and use the proper size
@ -315,12 +315,12 @@ void ensureMinimumWindowSize(uiWindow *w)
c = uiWindowsControl(w); c = uiWindowsControl(w);
(*(c->MinimumSize))(c, NULL, &width, &height); (*(c->MinimumSize))(c, NULL, &width, &height);
if (GetClientRect(w->hwnd, &r) == 0) if (GetClientRect(w->hwnd, &r) == 0)
logLastError("error getting client rect in ensureMinimumWindowSize()"); logLastError(L"error getting client rect");
if (width < (r.right - r.left)) // preserve width if larger if (width < (r.right - r.left)) // preserve width if larger
width = r.right - r.left; width = r.right - r.left;
if (height < (r.bottom - r.top)) // preserve height if larger if (height < (r.bottom - r.top)) // preserve height if larger
height = r.bottom - r.top; height = r.bottom - r.top;
clientSizeToWindowSize(w->hwnd, &width, &height, w->hasMenubar); clientSizeToWindowSize(w->hwnd, &width, &height, w->hasMenubar);
if (SetWindowPos(w->hwnd, NULL, 0, 0, width, height, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER) == 0) if (SetWindowPos(w->hwnd, NULL, 0, 0, width, height, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER) == 0)
logLastError("error resizing window in ensureMinimumWindowSize()"); logLastError(L"error resizing window");
} }