deblan-mirror/wails
1
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2026-03-14 14:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Support retina images

Browse source
This commit is contained in:
Lea Anthony 2022-05-02 20:16:04 +10:00
commit 58b6e4c335
No known key found for this signature in database
GPG key ID: 33DAF7BB90A58405
6 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
v2/internal/frontend/desktop/darwin/Application.h
View file

@ -72,4 +72,6 @@ NSString* safeInit(const char* input);
void SetTrayImage(void *nsStatusItem, void *imageData, int imageDataLength, int template, int position);
bool IsRetina(void *ctx);
#endif /* Application_h */

5
v2/internal/frontend/desktop/darwin/Application.m
View file

@ -378,6 +378,11 @@ void SetTrayImage(void *nsStatusItem, void *imageData, int imageDataLength, int
)
}
bool IsRetina(void *ctx) {
CGFloat scale = [((WailsContext*)ctx).mainWindow backingScaleFactor];
return scale != (CGFloat)1;
}
void Run(void *inctx, const char* url, int activationPolicy) {
WailsContext *ctx = (__bridge WailsContext*) inctx;
NSApplication *app = [NSApplication sharedApplication];

17
v2/internal/frontend/desktop/darwin/menu.go
View file

@ -46,7 +46,7 @@ func objectCreated(id uint32, pointer unsafe.Pointer) {
createNSObjectMapLock.Unlock()
}
func NewNSTrayMenu(context unsafe.Pointer, trayMenu *menu.TrayMenu) *NSTrayMenu {
func NewNSTrayMenu(context unsafe.Pointer, trayMenu *menu.TrayMenu, isRetina bool) *NSTrayMenu {
c := NewCalloc()
defer c.Free()
@ -57,6 +57,7 @@ func NewNSTrayMenu(context unsafe.Pointer, trayMenu *menu.TrayMenu) *NSTrayMenu
result := &NSTrayMenu{
context: context,
nsStatusItem: nsStatusItem,
isRetina: isRetina,
}
if trayMenu.Label != "" {
@ -77,11 +78,21 @@ func NewNSTrayMenu(context unsafe.Pointer, trayMenu *menu.TrayMenu) *NSTrayMenu
}
func (n *NSTrayMenu) SetImage(image *menu.TrayImage) {
if image.Image == nil {
if !n.isRetina && image.Image == nil {
return
}
var imagePtr unsafe.Pointer
if image.Image != nil {
imagePtr = unsafe.Pointer(&image.Image[0])
}
if n.isRetina && image.Image2x != nil {
imagePtr = unsafe.Pointer(&image.Image2x[0])
}
C.SetTrayImage(n.nsStatusItem,
unsafe.Pointer(&image.Image[0]),
imagePtr,
C.int(len(image.Image)),
bool2Cint(image.IsTemplate),
C.int(image.Position),

3
v2/internal/frontend/desktop/darwin/traymenu.go
View file

@ -25,6 +25,7 @@ func (f *Frontend) TrayMenuAdd(trayMenu *menu.TrayMenu) menu.TrayMenuImpl {
type NSTrayMenu struct {
context unsafe.Pointer
nsStatusItem unsafe.Pointer // NSStatusItem
isRetina bool
}
func (n *NSTrayMenu) SetLabel(label string) {
@ -33,5 +34,5 @@ func (n *NSTrayMenu) SetLabel(label string) {
}
func (w *Window) TrayMenuAdd(trayMenu *menu.TrayMenu) *NSTrayMenu {
return NewNSTrayMenu(w.context, trayMenu)
return NewNSTrayMenu(w.context, trayMenu, IsRetina(w))
}

4
v2/internal/frontend/desktop/darwin/window.go
View file

@ -40,6 +40,10 @@ func bool2Cint(value bool) C.int {
return C.int(0)
}
func IsRetina(window *Window) bool {
return bool(C.IsRetina(window.context))
}
func NewWindow(frontendOptions *options.App, debugMode bool) *Window {
c := NewCalloc()

1
v2/pkg/menu/tray.go
View file

@ -31,6 +31,7 @@ const (
type TrayImage struct {
Image []byte
Image2x []byte
IsTemplate bool
Position ImagePosition
}