mirror of
https://github.com/wailsapp/wails.git
synced 2025-05-02 17:39:58 +08:00
04d35410de
* get dimensions working for linux * Cleaning up some GTK code I was getting the following errors due to some bad casts. Gdk-CRITICAL **: 18:58:51.943: gdk_monitor_get_geometry: assertion 'GDK_IS_MONITOR (monitor)' failed Gdk-CRITICAL **: 18:58:51.943: gdk_display_get_monitor_at_window: assertion 'GDK_IS_DISPLAY (display)' failed This commit fixes these errors * Adding Screen namespace along with linux implementation * moving ScreenGetAll into a more appropriate place * Fixing typescript definition mistake, documentation, ordering of functions, and formatting * add ScreenGetAll to more templates * moving screen into its own javascript file * fixing bug where screen objects are not returned from the runtime function * rebuilding frontend wrapper package * adding windows implementation of ScreenGetAll * adding screen get all implementation for darwin * reverting a change that is unrelated to the work on expose-dimensions * removing duplicate comparison * changing GetNthScreen in screen API on macos To use frame instead of visibleframe to keep into account the space the the dock takes up We want to include that space in the calculation in order to keep the sizes of screens consistent across platforms * Correcting screen jsdoc It used to say it returned a single screen object. Now it says that it returns an array of screen objects * Fixing typo in function name * reverting pointless spacing change * reverting pointless spacing change Co-authored-by: Lea Anthony <lea.anthony@gmail.com> Co-authored-by: shmuel.kamensky <shmuel.kamensky@shutterfly.com>
78 lines
2.5 KiB
Go
78 lines
2.5 KiB
Go
//go:build darwin
|
||
// +build darwin
|
||
|
||
package darwin
|
||
|
||
/*
|
||
#cgo CFLAGS: -x objective-c
|
||
#cgo LDFLAGS: -framework Foundation -framework Cocoa -framework WebKit -framework AppKit
|
||
#import <Foundation/Foundation.h>
|
||
#include <AppKit/AppKit.h>
|
||
#include <stdlib.h>
|
||
|
||
#import "Application.h"
|
||
#import "WailsContext.h"
|
||
|
||
typedef struct Screen {
|
||
int isCurrent;
|
||
int isPrimary;
|
||
int height;
|
||
int width;
|
||
} Screen;
|
||
|
||
|
||
int GetNumScreens(){
|
||
return [[NSScreen screens] count];
|
||
}
|
||
|
||
int screenUniqueID(NSScreen *screen){
|
||
// adapted from https://stackoverflow.com/a/1237490/4188138
|
||
NSDictionary* screenDictionary = [screen deviceDescription];
|
||
NSNumber* screenID = [screenDictionary objectForKey:@"NSScreenNumber"];
|
||
CGDirectDisplayID aID = [screenID unsignedIntValue];
|
||
return aID;
|
||
}
|
||
|
||
Screen GetNthScreen(int nth, void *inctx){
|
||
WailsContext *ctx = (__bridge WailsContext*) inctx;
|
||
NSArray<NSScreen *> *screens = [NSScreen screens];
|
||
NSScreen* nthScreen = [screens objectAtIndex:nth];
|
||
NSScreen* currentScreen = [ctx getCurrentScreen];
|
||
|
||
Screen returnScreen;
|
||
returnScreen.isCurrent = (int)(screenUniqueID(currentScreen)==screenUniqueID(nthScreen));
|
||
// TODO properly handle screen mirroring
|
||
// from apple documentation:
|
||
// https://developer.apple.com/documentation/appkit/nsscreen/1388393-screens?language=objc
|
||
// The screen at index 0 in the returned array corresponds to the primary screen of the user’s system. This is the screen that contains the menu bar and whose origin is at the point (0, 0). In the case of mirroring, the first screen is the largest drawable display; if all screens are the same size, it is the screen with the highest pixel depth. This primary screen may not be the same as the one returned by the mainScreen method, which returns the screen with the active window.
|
||
returnScreen.isPrimary = nth==0;
|
||
returnScreen.height = (int) nthScreen.frame.size.height;
|
||
returnScreen.width = (int) nthScreen.frame.size.width;
|
||
return returnScreen;
|
||
}
|
||
|
||
*/
|
||
import "C"
|
||
import (
|
||
"github.com/wailsapp/wails/v2/internal/frontend"
|
||
"unsafe"
|
||
)
|
||
|
||
func GetAllScreens(wailsContext unsafe.Pointer) ([]frontend.Screen, error) {
|
||
err := error(nil)
|
||
screens := []frontend.Screen{}
|
||
numScreens := int(C.GetNumScreens())
|
||
for screeNum := 0; screeNum < numScreens; screeNum++ {
|
||
screenNumC := C.int(screeNum)
|
||
cScreen := C.GetNthScreen(screenNumC, wailsContext)
|
||
screen := frontend.Screen{
|
||
Height: int(cScreen.height),
|
||
Width: int(cScreen.width),
|
||
IsCurrent: cScreen.isCurrent == C.int(1),
|
||
IsPrimary: cScreen.isPrimary == C.int(1),
|
||
}
|
||
screens = append(screens, screen)
|
||
}
|
||
return screens, err
|
||
}
|