From f8fde9e8d0b8270f082b778b44627a03dd59c57c Mon Sep 17 00:00:00 2001
From: 8o7wer <8o7wermobile@gmail.com>
Date: Fri, 10 May 2019 17:56:35 -0800
Subject: Revert "Added the ability to get width, height, and refresh rate from
 the monitor through win.GetPrimaryMonitor()."

This reverts commit dc5d91b238e9260b2e61224fc8b8cabbb3440323.
---
 win/monitor.go | 42 ------------------------------------------
 win/win.go     | 30 ------------------------------
 2 files changed, 72 deletions(-)
 delete mode 100644 win/monitor.go

(limited to 'win')

diff --git a/win/monitor.go b/win/monitor.go
deleted file mode 100644
index 931484a..0000000
--- a/win/monitor.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package win
-
-import (
-  "github.com/faiface/mainthread"
-  "github.com/go-gl/glfw/v3.2/glfw"
-)
-
-
-// Holds information on a monitor
-type Monitor struct {
-  Width, Height int
-  RefreshRate   int
-}
-
-// Returns a struct containing information about the primary monitor
-func GetPrimaryMonitor() (Monitor, error) {
-  returns := mainthread.CallVal( func() interface{} {
-    err := glfw.Init()
-    if err != nil {
-      return err
-    }
-
-    return glfw.GetPrimaryMonitor().GetVideoMode()
-  })
-
-  monitor := Monitor{0, 0, 0}
-  var err error = nil
-
-  switch v := returns.(type) {
-    case *glfw.VidMode:
-      videoMode := v
-
-      width := videoMode.Width
-      height := videoMode.Height
-      refreshRate := videoMode.RefreshRate
-      monitor = Monitor{width, height, refreshRate}
-    case error:
-      err = v
-  }
-
-  return monitor, err
-}
diff --git a/win/win.go b/win/win.go
index 519db84..f624f35 100644
--- a/win/win.go
+++ b/win/win.go
@@ -20,8 +20,6 @@ type options struct {
 	title         string
 	width, height int
 	resizable     bool
-	borderless		bool
-	maximized			bool
 }
 
 // Title option sets the title (caption) of the window.
@@ -46,20 +44,6 @@ func Resizable() Option {
 	}
 }
 
-//Borderless option makes the window borderless
-func Borderless() Option {
-	return func(o *options) {
-		o.borderless = true
-	}
-}
-
-//Maximized option makes the window start maximized
-func Maximized() Option {
-	return func(o *options) {
-		o.maximized = true
-	}
-}
-
 // New creates a new window with all the supplied options.
 //
 // The default title is empty and the default size is 640x480.
@@ -69,8 +53,6 @@ func New(opts ...Option) (*Win, error) {
 		width:     640,
 		height:    480,
 		resizable: false,
-		borderless: false,
-		maximized: false,
 	}
 	for _, opt := range opts {
 		opt(&o)
@@ -98,9 +80,6 @@ func New(opts ...Option) (*Win, error) {
 		// hiDPI hack
 		width, _ := w.w.GetFramebufferSize()
 		w.ratio = width / o.width
-		if w.ratio < 1 {
-			w.ratio = 1
-		}
 		if w.ratio != 1 {
 			o.width /= w.ratio
 			o.height /= w.ratio
@@ -136,16 +115,7 @@ func makeGLFWWin(o *options) (*glfw.Window, error) {
 	} else {
 		glfw.WindowHint(glfw.Resizable, glfw.False)
 	}
-	if o.borderless {
-		glfw.WindowHint(glfw.Decorated, glfw.False)
-	}
-	if o.maximized {
-		glfw.WindowHint(glfw.Maximized, glfw.True)
-	}
 	w, err := glfw.CreateWindow(o.width, o.height, o.title, nil, nil)
-	if o.maximized {
-		o.width, o.height = w.GetFramebufferSize() // set o.width and o.height to the window size due to the window being maximized
-	}
 	if err != nil {
 		return nil, err
 	}
-- 
cgit v1.2.3