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

Migrated functions from window.m.

This commit is contained in:
Pietro Gagliardi 2018-05-05 19:38:16 -04:00
parent 2f92f644b5
commit 090c783147
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
darwin/OLD_uipriv_darwin.h
View File

@ -1,10 +1,3 @@
// window.m
@interface libuiNSWindow : NSWindow
- (void)libui_doMove:(NSEvent *)initialEvent;
- (void)libui_doResize:(NSEvent *)initialEvent on:(uiWindowResizeEdge)edge;
@end
extern uiWindow *windowFromNSWindow(NSWindow *);
// alloc.m
extern NSMutableArray *delegates;
extern void initAlloc(void);

12
darwin/area.m
View File

@ -409,26 +409,26 @@ void uiAreaScrollTo(uiArea *a, double x, double y, double width, double height)
void uiAreaBeginUserWindowMove(uiArea *a)
{
libuiNSWindow *w;
uiprivNSWindow *w;
w = (libuiNSWindow *) [a->area window];
w = (uiprivNSWindow *) [a->area window];
if (w == nil)
return; // TODO
if (a->dragevent == nil)
return; // TODO
[w libui_doMove:a->dragevent];
[w uiprivDoMove:a->dragevent];
}
void uiAreaBeginUserWindowResize(uiArea *a, uiWindowResizeEdge edge)
{
libuiNSWindow *w;
uiprivNSWindow *w;
w = (libuiNSWindow *) [a->area window];
w = (uiprivNSWindow *) [a->area window];
if (w == nil)
return; // TODO
if (a->dragevent == nil)
return; // TODO
[w libui_doResize:a->dragevent on:edge];
[w uiprivDoResize:a->dragevent on:edge];
}
uiArea *uiNewArea(uiAreaHandler *ah)

2
darwin/menu.m
View File

@ -66,7 +66,7 @@ static void mapItemReleaser(void *key, void *value)
if (item->type == typeCheckbox)
uiMenuItemSetChecked(item, !uiMenuItemChecked(item));
// use the key window as the source of the menu event; it's the active window
(*(item->onClicked))(item, windowFromNSWindow([uiprivNSApp() keyWindow]), item->onClickedData);
(*(item->onClicked))(item, uiprivWindowFromNSWindow([uiprivNSApp() keyWindow]), item->onClickedData);
}
- (IBAction)onQuitClicked:(id)sender

7
darwin/uipriv_darwin.h
View File

@ -75,4 +75,11 @@ extern void uiprivDisableAutocorrect(NSTextView *);
extern void uiprivFinishNewTextField(NSTextField *, BOOL);
extern NSTextField *uiprivNewEditableTextField(void);
// window.m
@interface uiprivNSWindow : NSWindow
- (void)uiprivDoMove:(NSEvent *)initialEvent;
- (void)uiprivDoResize:(NSEvent *)initialEvent on:(uiWindowResizeEdge)edge;
@end
extern uiWindow *uiprivWindowFromNSWindow(NSWindow *);
#import "OLD_uipriv_darwin.h"

10
darwin/window.m
View File

@ -18,14 +18,14 @@ struct uiWindow {
int borderless;
};
@implementation libuiNSWindow
@implementation uiprivNSWindow
- (void)libui_doMove:(NSEvent *)initialEvent
- (void)uiprivDoMove:(NSEvent *)initialEvent
{
doManualMove(self, initialEvent);
}
- (void)libui_doResize:(NSEvent *)initialEvent on:(uiWindowResizeEdge)edge
- (void)uiprivDoResize:(NSEvent *)initialEvent on:(uiWindowResizeEdge)edge
{
doManualResize(self, initialEvent, edge);
}
@ -375,7 +375,7 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
uiDarwinNewControl(uiWindow, w);
w->window = [[libuiNSWindow alloc] initWithContentRect:NSMakeRect(0, 0, (CGFloat) width, (CGFloat) height)
w->window = [[uiprivNSWindow alloc] initWithContentRect:NSMakeRect(0, 0, (CGFloat) width, (CGFloat) height)
styleMask:defaultStyleMask
backing:NSBackingStoreBuffered
defer:YES];
@ -397,7 +397,7 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
}
// utility function for menus
uiWindow *windowFromNSWindow(NSWindow *w)
uiWindow *uiprivWindowFromNSWindow(NSWindow *w)
{
if (w == nil)
return NULL;