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

Cleanup, resizeable example in tester

This commit is contained in:
Niklas Mischkulnig 2018-03-24 18:50:35 +01:00
parent c683190b20
commit 07491c611f
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
darwin/window.m
View File

@ -366,7 +366,7 @@ int uiWindowResizeable(uiWindow *w)
void uiWindowSetResizeable(uiWindow *w, int resizeable) void uiWindowSetResizeable(uiWindow *w, int resizeable)
{ {
w->resizeable = resizeable; w->resizeable = resizeable;
if(resizeable){ if(resizeable) {
[w->window setStyleMask:[w->window styleMask] | NSResizableWindowMask]; [w->window setStyleMask:[w->window styleMask] | NSResizableWindowMask];
} else { } else {
[w->window setStyleMask:[w->window styleMask] & ~NSResizableWindowMask]; [w->window setStyleMask:[w->window styleMask] & ~NSResizableWindowMask];

1
examples/controlgallery/main.c
View File

@ -311,7 +311,6 @@ int main(void)
tab = uiNewTab(); tab = uiNewTab();
uiWindowSetChild(mainwin, uiControl(tab)); uiWindowSetChild(mainwin, uiControl(tab));
uiWindowSetMargined(mainwin, 1); uiWindowSetMargined(mainwin, 1);
uiWindowSetResizeable(mainwin, 0);
uiTabAppend(tab, "Basic Controls", makeBasicControlsPage()); uiTabAppend(tab, "Basic Controls", makeBasicControlsPage());
uiTabSetMargined(tab, 0, 1); uiTabSetMargined(tab, 0, 1);

9
test/menus.c
View File

@ -17,6 +17,7 @@ uiMenuItem *enableThisItem;
uiMenuItem *forceCheckedItem; uiMenuItem *forceCheckedItem;
uiMenuItem *forceUncheckedItem; uiMenuItem *forceUncheckedItem;
uiMenuItem *whatWindowItem; uiMenuItem *whatWindowItem;
uiMenuItem *resizeableItem;
uiMenu *moreTestsMenu; uiMenu *moreTestsMenu;
uiMenuItem *quitEnabledItem; uiMenuItem *quitEnabledItem;
uiMenuItem *prefsEnabledItem; uiMenuItem *prefsEnabledItem;
@ -50,6 +51,11 @@ static void whatWindow(uiMenuItem *item, uiWindow *w, void *data)
printf("menu item clicked on window %p\n", (void *) w); printf("menu item clicked on window %p\n", (void *) w);
} }
static void toggleResize(uiMenuItem *item, uiWindow *w, void *data)
{
uiWindowSetResizeable(w, uiMenuItemChecked(item));
}
void initMenus(void) void initMenus(void)
{ {
fileMenu = uiNewMenu("File"); fileMenu = uiNewMenu("File");
@ -79,6 +85,9 @@ void initMenus(void)
uiMenuAppendSeparator(testMenu); uiMenuAppendSeparator(testMenu);
whatWindowItem = uiMenuAppendItem(testMenu, "What Window?"); whatWindowItem = uiMenuAppendItem(testMenu, "What Window?");
uiMenuItemOnClicked(whatWindowItem, whatWindow, NULL); uiMenuItemOnClicked(whatWindowItem, whatWindow, NULL);
resizeableItem = uiMenuAppendCheckItem(testMenu, "Enable Resize");
uiMenuItemSetChecked(resizeableItem, 1);
uiMenuItemOnClicked(resizeableItem, toggleResize, NULL);
moreTestsMenu = uiNewMenu("More Tests"); moreTestsMenu = uiNewMenu("More Tests");
quitEnabledItem = uiMenuAppendCheckItem(moreTestsMenu, "Quit Item Enabled"); quitEnabledItem = uiMenuAppendCheckItem(moreTestsMenu, "Quit Item Enabled");