diff --git a/pixelgl/monitor.go b/pixelgl/monitor.go index 0d4a6d39cc785813e47d44b66fe2ef05d02654f7..90ae7cca4723dea3c00d7b6d6cd7a13fab4d6123 100644 --- a/pixelgl/monitor.go +++ b/pixelgl/monitor.go @@ -10,13 +10,15 @@ type Monitor struct { monitor *glfw.Monitor } -// VideoMode represents all properties of a video mode and is attached -// to a monitor if it is a fullscreen mode. +// VideoMode represents all properties of a video mode and is +// associated with a monitor if it is used in fullscreen mode. type VideoMode struct { - *glfw.VidMode - // Monitor is a pointer to the monitor that owns this video mode. - // If Monitor is nil the video mode is windowed. - Monitor *Monitor + // Width is the width of the vide mode in pixels. + Width int + // Height is the height of the video mode in pixels. + Height int + // RefreshRate holds the refresh rate of the associated monitor in Hz. + RefreshRate int } // PrimaryMonitor returns the main monitor (usually the one with the taskbar and stuff). @@ -106,15 +108,16 @@ func (m *Monitor) RefreshRate() (rate float64) { } // VideoModes returns all available video modes for the monitor. -func (m *Monitor) VideoModes() (vmodes []*VideoMode) { +func (m *Monitor) VideoModes() (vmodes []VideoMode) { var modes []*glfw.VidMode mainthread.Call(func() { modes = m.monitor.GetVideoModes() }) for _, mode := range modes { - vmodes = append(vmodes, &VideoMode{ - VidMode: mode, - Monitor: m, + vmodes = append(vmodes, VideoMode{ + Width: mode.Width, + Height: mode.Height, + RefreshRate: mode.RefreshRate, }) } return diff --git a/pixelgl/window.go b/pixelgl/window.go index 0668a9b270ae8507bf2c933b8008db7e2f8a0b0c..ddc5426c93055cb878a5ac6ba8d38a968873a3c5 100644 --- a/pixelgl/window.go +++ b/pixelgl/window.go @@ -424,9 +424,3 @@ func (w *Window) Clear(c color.Color) { func (w *Window) Color(at pixel.Vec) pixel.RGBA { return w.canvas.Color(at) } - -// SetVideoMode applies the given video mode to this window. -func (w *Window) SetVideoMode(vm VideoMode) { - w.SetMonitor(vm.Monitor) - w.SetBounds(pixel.R(0, 0, float64(vm.Width), float64(vm.Height))) -}