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

Mostly migrated windows/tab.c. A few things aren't working right... Also fixed a bad bug in windows/container.c.

This commit is contained in:
Pietro Gagliardi 2015-04-29 01:53:39 -04:00
parent c7bbd1d374
commit 97e40161af
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
new/windows/GNUmakeinc.mk
View File

@ -10,6 +10,7 @@ osCFILES = \
windows/main.c \ windows/main.c \
windows/menu.c \ windows/menu.c \
windows/newcontrol.c \ windows/newcontrol.c \
windows/tab.c \
windows/text.c \ windows/text.c \
windows/util.c \ windows/util.c \
windows/window.c windows/window.c

2
new/windows/container.c
View File

@ -141,7 +141,7 @@ static uintptr_t containerHandle(uiControl *cc)
static void containerSetParent(uiControl *cc, uiContainer *parent) static void containerSetParent(uiControl *cc, uiContainer *parent)
{ {
struct container *c = (struct container *) cc; struct container *c = (struct container *) (cc->Internal);
uiContainer *oldparent; uiContainer *oldparent;
HWND newparent; HWND newparent;

46
new/windows/tab.c
View File

@ -2,13 +2,12 @@
#include "uipriv_windows.h" #include "uipriv_windows.h"
// TODO // TODO
// - tab change notifications aren't being sent on wine (anymore...? TODO)
// - tell wine developers that tab controls do respond to parent changes on real windows (at least comctl6 tab controls do) // - tell wine developers that tab controls do respond to parent changes on real windows (at least comctl6 tab controls do)
struct tab { struct tab {
uiTab t; uiTab t;
HWND hwnd; HWND hwnd;
uiParent **pages; uiContainer **pages;
uintmax_t len; uintmax_t len;
uintmax_t cap; uintmax_t cap;
}; };
@ -28,13 +27,13 @@ static BOOL onWM_NOTIFY(uiControl *c, NMHDR *nm, LRESULT *lResult)
case TCN_SELCHANGING: case TCN_SELCHANGING:
n = SendMessageW(t->hwnd, TCM_GETCURSEL, 0, 0); n = SendMessageW(t->hwnd, TCM_GETCURSEL, 0, 0);
if (n != (LRESULT) (-1)) // if we're changing to a real tab if (n != (LRESULT) (-1)) // if we're changing to a real tab
ShowWindow(uiParentHWND(t->pages[n]), SW_HIDE); uiControlHide(uiControl(t->pages[n]));
*lResult = FALSE; // and allow the change *lResult = FALSE; // and allow the change
return TRUE; return TRUE;
case TCN_SELCHANGE: case TCN_SELCHANGE:
n = SendMessageW(t->hwnd, TCM_GETCURSEL, 0, 0); n = SendMessageW(t->hwnd, TCM_GETCURSEL, 0, 0);
if (n != (LRESULT) (-1)) { // if we're changing to a real tab if (n != (LRESULT) (-1)) { // if we're changing to a real tab
ShowWindow(uiParentHWND(t->pages[n]), SW_SHOW); uiControlHide(uiControl(t->pages[n]));
// because we only resize the current child on resize, we'll need to trigger an update here // because we only resize the current child on resize, we'll need to trigger an update here
// don't call uiParentUpdate(); doing that won't size the content area (so we'll still have a 0x0 content area, for instance) // don't call uiParentUpdate(); doing that won't size the content area (so we'll still have a 0x0 content area, for instance)
SendMessageW(t->hwnd, msgUpdateChild, 0, 0); SendMessageW(t->hwnd, msgUpdateChild, 0, 0);
@ -50,8 +49,13 @@ static void onDestroy(void *data)
struct tab *t = (struct tab *) data; struct tab *t = (struct tab *) data;
uintmax_t i; uintmax_t i;
// first, hide the widget to avoid flicker
ShowWindow(t->hwnd, SW_HIDE);
// because the pages don't have by a libui paent, we can simply destroy them
// we don't have to worry about the Windows tab control holding a reference to our bin; there is no reference holding anyway
for (i = 0; i < t->len; i++) for (i = 0; i < t->len; i++)
uiParentDestroy(t->pages[i]); uiControlDestroy(uiControl(t->pages[i]));
// and finally destroy ourselves
uiFree(t->pages); uiFree(t->pages);
uiFree(t); uiFree(t);
} }
@ -80,11 +84,11 @@ static void resizeTab(struct tab *t, LONG width, LONG height)
// convert to the display rectangle // convert to the display rectangle
SendMessageW(t->hwnd, TCM_ADJUSTRECT, FALSE, (LPARAM) (&r)); SendMessageW(t->hwnd, TCM_ADJUSTRECT, FALSE, (LPARAM) (&r));
if (MoveWindow(uiParentHWND(t->pages[n]), r.left, r.top, r.right - r.left, r.bottom - r.top, TRUE) == 0) //TODO uiControlResize(uiControl(t->pages[n]), r.left, r.top, r.right - r.left, r.bottom - r.top);
logLastError("error resizing current tab page in resizeTab()");
} }
// and finally, because we have to resize parents, we have to handle resizes and updates // and finally, because we have to resize parents, we have to handle resizes and updates
// TODO see if this approach is /really/ necessary and we can get by with an alteration to the above function and overriding uiControlResize()
static LRESULT CALLBACK tabSubProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) static LRESULT CALLBACK tabSubProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData)
{ {
struct tab *t = (struct tab *) dwRefData; struct tab *t = (struct tab *) dwRefData;
@ -117,27 +121,27 @@ static LRESULT CALLBACK tabSubProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l
#define tabCapGrow 32 #define tabCapGrow 32
static void tabAddPage(uiTab *tt, const char *name, uiControl *child) static void tabAppendPage(uiTab *tt, const char *name, uiControl *child)
{ {
struct tab *t = (struct tab *) tt; struct tab *t = (struct tab *) tt;
TCITEMW item; TCITEMW item;
LRESULT n; LRESULT n;
uiParent *parent; uiContainer *page;
WCHAR *wname; WCHAR *wname;
if (t->len >= t->cap) { if (t->len >= t->cap) {
t->cap += tabCapGrow; t->cap += tabCapGrow;
t->pages = (uiParent **) uiRealloc(t->pages, t->cap * sizeof (uiParent *), "uiParent *[]"); t->pages = (uiContainer **) uiRealloc(t->pages, t->cap * sizeof (uiContainer *), "uiContainer *[]");
} }
n = SendMessageW(t->hwnd, TCM_GETITEMCOUNT, 0, 0); n = SendMessageW(t->hwnd, TCM_GETITEMCOUNT, 0, 0);
parent = uiNewParent((uintptr_t) (t->hwnd)); page = newBin();
uiParentSetMainControl(parent, child); binSetMainControl(page, child);
uiParentUpdate(parent); binSetParent(page, (uintptr_t) (t->hwnd));
if (n != 0) // if this isn't the first page, we have to hide the other controls if (n != 0) // if this isn't the first page, we have to hide the other controls
ShowWindow(uiParentHWND(parent), SW_HIDE); uiControlHide(uiControl(page));
t->pages[t->len] = parent; t->pages[t->len] = page;
t->len++; t->len++;
ZeroMemory(&item, sizeof (TCITEMW)); ZeroMemory(&item, sizeof (TCITEMW));
@ -159,7 +163,7 @@ static void tabAddPage(uiTab *tt, const char *name, uiControl *child)
static void tabDeletePage(uiTab *tt, uintmax_t n) static void tabDeletePage(uiTab *tt, uintmax_t n)
{ {
struct tab *t = (struct tab *) tt; struct tab *t = (struct tab *) tt;
uiParent *p; uiContainer *page;
uintmax_t i; uintmax_t i;
// first delete the tab from the tab control // first delete the tab from the tab control
@ -168,15 +172,17 @@ static void tabDeletePage(uiTab *tt, uintmax_t n)
logLastError("error deleting Tab page in tabDeletePage()"); logLastError("error deleting Tab page in tabDeletePage()");
// now delete the page itself // now delete the page itself
p = t->pages[n]; page = t->pages[n];
for (i = n; i < t->len - 1; i++) for (i = n; i < t->len - 1; i++)
t->pages[i] = t->pages[i + 1]; t->pages[i] = t->pages[i + 1];
t->pages[i] = NULL; t->pages[i] = NULL;
t->len--; t->len--;
// make sure the page's control isn't destroyed // make sure the page's control isn't destroyed
uiParentSetMainControl(p, NULL); binSetMainControl(page, NULL);
uiParentDestroy(p);
// see tabDestroy() above for details
uiControlDestroy(uiControl(page));
} }
uiTab *uiNewTab(void) uiTab *uiNewTab(void)
@ -205,7 +211,7 @@ uiTab *uiNewTab(void)
uiControl(t)->PreferredSize = preferredSize; uiControl(t)->PreferredSize = preferredSize;
uiTab(t)->AddPage = tabAddPage; uiTab(t)->AppendPage = tabAppendPage;
uiTab(t)->DeletePage = tabDeletePage; uiTab(t)->DeletePage = tabDeletePage;
return uiTab(t); return uiTab(t);