revery-ui · zbaylin · Dec 25, 2020 · Dec 24, 2020 · Dec 24, 2020 · Dec 25, 2020
diff --git a/examples/Examples.re b/examples/Examples.re
@@ -373,6 373,8 @@ let init = app => {
  Window.onMoved(window, ((x, y)) =>
  Console.log(Printf.sprintf("Moved: %d x %d", x, y))
  );
 
  Console.log(Printf.sprintf("Operating system: %s", Environment.osString));
 
  let _renderFunction =
  UI.start(window, <ExampleHost window initialExample />);

diff --git a/src/Core/Environment.re b/src/Core/Environment.re
@@ -16,29 16,29 @@ let sleep = (t: Time.t) =>
 external yield: unit => unit = "caml_thread_yield";
 
 type os =
- | Android
- | IOS
- | Linux
- | Mac
- | Windows
- | Browser
- | Unknown;
  Revery_Native.Environment.os =
  | Unknown
  | Android
  | IOS
  | Linux
  | Windows
  | Browser
  | Mac(int, int, int);
 
 let os = {
- webGL
- ? Browser
- : (
- switch (Revery_Native.Environment.get_os()) {
- | `Android => Android
- | `IOS => IOS
- | `Linux => Linux
- | `Mac => Mac
- | `Windows => Windows
- | _ => Unknown
- }
- );
  webGL ? Browser : Revery_Native.Environment.getOS();
 };
 
 let osString = switch (os) {
  | Mac(major, minor, bugfix) => Printf.sprintf("macOS %d.%d.%d", major, minor, bugfix)
  | Windows => "Windows"
  | Linux => "Linux"
  | Android => "Android"
  | Browser => "Browser"
  | IOS => "iOS"
  | Unknown => "Unknown"
  };
 
 module Internal = {
  let addTrailingSlash = dir => {
  let len = String.length(dir);
@@ -65,7 65,7 @@ let getExecutingDirectory = () =>
  * the symlink destination - this causes problems when trying to load assets
  * relative to the binary location when symlinked.
  */
- | Mac =>
  | Mac(_) =>
  switch (
  String.rindex_opt(Sys.executable_name, '/'),
  String.rindex_opt(Sys.executable_name, '\\'),

diff --git a/src/Core/Environment.rei b/src/Core/Environment.rei
@@ -47,15 47,16 @@ let getAssetPath: string => string;
 let getTempDirectory: unit => string;
 
 type os =
  | Unknown
  | Android
  | IOS
  | Linux
- | Mac
  | Windows
  | Browser
- | Unknown;
  | Mac(int, int, int);
 
 let os: os;
 let osString: string;
 
 /**
 [getUserLocale] returns the current user locale. Note that on some platforms

diff --git a/src/Core/Window.re b/src/Core/Window.re
@@ -68,7 68,7 @@ module WindowMetrics: {
  // Mac and iOS is easy... there isn't any scaling factor. The window is automatically
  // proportioned for us. The scaling is handled by the ratio of size / framebufferSize.
  | IOS
- | Mac => 1.0
  | Mac(_) => 1.0
  // On Windows, we need to try a Win32 API to get the scale factor
  | Windows =>
  let scale = Sdl2.Window.getWin32ScaleFactor(sdlWindow);
@@ -238,7 238,7 @@ type t = {
 module Internal = {
  let setTitlebarStyle = (w: Sdl2.Window.t, style: WindowStyles.titlebar) => {
  switch (Environment.os) {
- | Mac =>
  | Mac(_) =>
  switch (style) {
  | Transparent => Sdl2.Window.setMacTitlebarTransparent(w)
  | Hidden => Sdl2.Window.setMacTitlebarHidden(w)

diff --git a/src/Font/FontFamily.re b/src/Font/FontFamily.re
@@ -82,20 82,20 @@ let fromFile = (fileName, ~italic as _, _) => {
 let default =
  switch (Revery_Core.Environment.os) {
  | Linux => system("Liberation Sans")
- | Mac => system("System Font")
  | Mac(_) => system("System Font")
  | _ => system("Arial")
  };
 
 let defaultMono =
  switch (Revery_Core.Environment.os) {
- | Mac => system("Menlo")
  | Mac(_) => system("Menlo")
  | Windows => system("Consolas")
  | _ => fromFile("Inconsolata.otf")
  };
 
 let defaultSerif =
  switch (Revery_Core.Environment.os) {
- | Mac => system("Palatino")
  | Mac(_) => system("Palatino")
  | Linux => system("Liberation Serif")
  | _ => system("Times New Roman")
  };

diff --git a/src/Native/Environment.re b/src/Native/Environment.re
@@ -1,10 1,13 @@
-external get_os: unit => string = "revery_getOperatingSystem";
-let get_os = () =>
- switch (get_os()) {
- | "android" => `Android
- | "ios" => `IOS
- | "linux" => `Linux
- | "mac" => `Mac
- | "windows" => `Windows
- | _ => `Unknown
- };
 /* If you change these you *must* keep environment.c up to date. */
 type os =
  /* Int values */
  | Unknown // 0
  | Android // 1
  | IOS // 2
  | Linux // 3
  | Windows // 4
  | Browser // 5
  /* Block values */
  | Mac(int, int, int); // 0
 
 external getOS: unit => os = "revery_getOperatingSystem";
diff --git a/src/Native/ReveryCocoa.h b/src/Native/ReveryCocoa.h
@@ -39,3 39,4 @@ void revery_menuRemoveItem_cocoa(void *nsMenu, void *nsMenuItem);
 void revery_menuInsertItemAt_cocoa(void *nsMenu, void *nsMenuItem, int idx);
 void revery_menuInsertSubmenuAt_cocoa(void *parent, void *child, int idx);
 void revery_menuClear_cocoa(void *nsMenu);
 
diff --git a/src/Native/ReveryMac.h b/src/Native/ReveryMac.h
@@ -0,0 1,4 @@
 #pragma once
 
 /* Environment functions */
 void getOperatingSystemVersion_mac(int *major, int *minor, int *bugfix);
diff --git a/src/Native/config/discover.re b/src/Native/config/discover.re
@@ -68,6 68,7 @@ let gen_config_header = (conf, features) => {
  | Windows => "windows"
  };
  };
  let is_os = os => get_os(conf) == os ? Value.Int(1) : Value.Switch(false);
 
  gen_header_file(
  conf,
@@ -77,6 78,11 @@ let gen_config_header = (conf, features) => {
  ("USE_GTK", includes(GTK)),
  ("USE_UIKIT", includes(UIKIT)),
  ("USE_WIN32", includes(WIN32)),
  ("IS_IOS", is_os(IOS)),
  ("IS_MACOS", is_os(Mac)),
  ("IS_ANDROID", is_os(Android)),
  ("IS_LINUX", is_os(Linux)),
  ("IS_WINDOWS", is_os(Windows)),
  ],
  );
 };

diff --git a/src/Native/dune b/src/Native/dune
@@ -9,7 9,7 @@
  Revery_Native
  dialog dialog_cocoa dialog_win32 dialog_gtk
  notification notification_cocoa
- environment
  environment environment_mac
  icon icon_cocoa icon_win32
  shell shell_cocoa shell_gtk shell_win32
  locale locale_cocoa locale_win32

diff --git a/src/Native/environment.c b/src/Native/environment.c
@@ -11,8 11,31 @@
 #include <caml/mlvalues.h>
 
 #include "config.h"
 #ifdef IS_MACOS
 #import "ReveryMac.h"
 #endif
 
 CAMLprim value revery_getOperatingSystem() {
  CAMLparam0();
- CAMLreturn(caml_copy_string(PLATFORM_NAME));
  CAMLlocal1(vOS);
 #ifdef IS_ANDROID
  vOS = Val_int(1);
 #elif IS_IOS
  vOS = Val_int(2);
 #elif IS_LINUX
  vOS = Val_int(3);
 #elif IS_WINDOWS
  vOS = Val_int(4);
 #elif IS_MACOS
  int major, minor, bugfix;
  getOperatingSystemVersion_mac(&major, &minor, &bugfix);
  vOS = caml_alloc(3, 0);
  Store_field(vOS, 0, Val_int(major));
  Store_field(vOS, 1, Val_int(minor));
  Store_field(vOS, 2, Val_int(bugfix));
 #else
  vOS = Val_int(0);
 #endif
 
  CAMLreturn(vOS);
 }
diff --git a/src/Native/environment_mac.c b/src/Native/environment_mac.c
@@ -0,0 1,12 @@
 #include "config.h"
 #ifdef IS_MACOS
 #import <Foundation/Foundation.h>
 
 void getOperatingSystemVersion_mac(int *major, int *minor, int *bugfix) {
  NSOperatingSystemVersion nsOSVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
  *major = nsOSVersion.majorVersion;
  *minor = nsOSVersion.minorVersion;
  *bugfix = nsOSVersion.patchVersion;
 }
 
 #endif
diff --git a/src/UI_Components/Input.re b/src/UI_Components/Input.re
@@ -320,7 320,11 @@ let%component make =
  onKeyDown(event);
 
  let code = event.keycode;
- let mac = Environment.os === Mac;
  let mac =
  switch (Environment.os) {
  | Mac(_) => true
  | _ => false
  };
  let super = Sdl2.Keymod.isGuiDown(event.keymod);
  let ctrl = Sdl2.Keymod.isControlDown(event.keymod);
 

diff --git a/src/UI_Components/ScrollView.re b/src/UI_Components/ScrollView.re
@@ -13,7 13,11 @@ let empty = React.empty;
 
 let scrollTrackColor = Color.rgba(0.0, 0.0, 0.0, 0.4);
 let scrollThumbColor = Color.rgba(0.5, 0.5, 0.5, 0.4);
-let isMac = Environment.os === Mac;
 let isMac =
  switch (Environment.os) {
  | Mac(_) => true
  | _ => false
  };
 
 type action =
  | ScrollUpdated(int);