diff options
| -rw-r--r-- | .github/workflows/buildpackage-mac.yml | 1 | ||||
| -rw-r--r-- | printrun/gl/panel.py | 16 |
2 files changed, 8 insertions, 9 deletions
diff --git a/.github/workflows/buildpackage-mac.yml b/.github/workflows/buildpackage-mac.yml index d070cdf..90b385e 100644 --- a/.github/workflows/buildpackage-mac.yml +++ b/.github/workflows/buildpackage-mac.yml @@ -38,7 +38,6 @@ jobs: export git_hash=$(git rev-parse --short "$GITHUB_SHA") sed -i '' '$ s/.$//' pronterface.spec cat >> pronterface.spec <<EOL - , info_plist={ 'CFBundleShortVersionString': '$git_hash', 'NSPrincipalClass': 'NSApplication', diff --git a/printrun/gl/panel.py b/printrun/gl/panel.py index e1b1013..0253599 100644 --- a/printrun/gl/panel.py +++ b/printrun/gl/panel.py @@ -268,14 +268,14 @@ class wxGLPanel(BASE_CLASS): glMatrixMode(GL_MODELVIEW) glLoadIdentity() self.setup_lights() - if self.orthographic: - wratio = self.width / self.dist - hratio = self.height / self.dist - minratio = float(min(wratio, hratio)) - self.zoom_factor = 1.0 - self.zoomed_width = wratio / minratio - self.zoomed_height = hratio / minratio - glScalef(factor * minratio, factor * minratio, 1) + + wratio = self.width / self.dist + hratio = self.height / self.dist + minratio = float(min(wratio, hratio)) + self.zoom_factor = 1.0 + self.zoomed_width = wratio / minratio + self.zoomed_height = hratio / minratio + glScalef(factor * minratio, factor * minratio, 1) def DrawCanvas(self): """Draw the window.""" |