Resize GLView on Window resize

jhanssen · Sep 4, 2017 · df1895b · df1895b
1 parent 6d186b3
commit df1895b
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/clients/mac/View.mm b/clients/mac/View.mm
@@ -53,7 +53,7 @@ -(void) drawRect: (NSRect) bounds
         glClearColor(0, 0, 0, 0);
         glClear(GL_COLOR_BUFFER_BIT);
         if (texture) {
-            GLfloat		texMatrix[16]	= {0};
+            GLfloat		texMatrix[16] = {0};
             GLint		saveMatrixMode;
 
             // Reverses and normalizes the texture
@@ -65,7 +65,6 @@ -(void) drawRect: (NSRect) bounds
 
             glGetIntegerv(GL_MATRIX_MODE, &saveMatrixMode);
             glMatrixMode(GL_TEXTURE);
-            glPushMatrix();
             glLoadMatrixf(texMatrix);
             glMatrixMode(saveMatrixMode);
 
@@ -84,6 +83,19 @@ -(void) drawRect: (NSRect) bounds
 }
 @end
 
+@interface WindowController : NSWindowController <NSWindowDelegate> {
+    @public GLView* view;
+    @public NSWindow* window;
+}
+@end
+
+@implementation WindowController
+- (void)windowDidResize:(NSNotification *)notification {
+    glViewport(0, 0, window.frame.size.width, window.frame.size.height);
+    [view setNeedsDisplay:YES];
+}
+@end
+
 class ViewPrivate
 {
 public:
@@ -207,6 +219,10 @@ static void audioOutput(void *inClientData, AudioQueueRef inAQ,
                 [window center];
                 [window setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
 
+                WindowController* controller = [[WindowController alloc] init];
+                controller->window = window;
+                [window setDelegate:controller];
+
                 NSView* content_view = [window contentView];
                 [content_view setAutoresizesSubviews:YES];
                 GLView* glview = [[[GLView alloc]
@@ -216,6 +232,8 @@ static void audioOutput(void *inClientData, AudioQueueRef inAQ,
                 [content_view addSubview:glview];
                 [glview retain];
 
+                controller->view = glview;
+
                 glview->texture = 0;
                 glview->width = w;
                 glview->height = h;