Fixed issue #1093.

nilsschmidt1337 · Jul 30, 2024 · 8e8b7a7 · 8e8b7a7
1 parent 6df8904
commit 8e8b7a7
Showing 1 changed file with 49 additions and 29 deletions.
diff --git a/src/org/nschmidt/ldparteditor/shell/editor3d/toolitem/MiscToolItem.java b/src/org/nschmidt/ldparteditor/shell/editor3d/toolitem/MiscToolItem.java
@@ -2477,35 +2477,9 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
 
                                     Project.setFileToEdit(main);
 
-                                    Editor3DWindow.getWindow().openDatFile(main, OpenInWhat.EDITOR_3D, null);
-                                    final int viewCount = WorkbenchManager.getUserSettingState().getPartReview3dViewCount();
-                                    if (viewCount > 1) Editor3DWindow.getRenders().get(0).getC3D().getModifier().splitViewHorizontally();
-                                    if (viewCount > 2) Editor3DWindow.getRenders().get(0).getC3D().getModifier().splitViewVertically();
-                                    if (viewCount > 3) Editor3DWindow.getRenders().get(1).getC3D().getModifier().splitViewVertically();
-
-                                    int state = 0;
-                                    for (OpenGLRenderer renderer : Editor3DWindow.getRenders()) {
-                                        Composite3D c3d = renderer.getC3D();
-                                        WidgetSelectionHelper.unselectAllChildButtons(c3d.mnuRenderMode);
-                                        if (state == 0) {
-                                            c3d.mntmNoBFCPtr[0].setSelection(true);
-                                            c3d.getMntmStudLogo().setSelection(true);
-                                            c3d.getModifier().switchShowingLogo(true);
-                                            c3d.getModifier().setRenderMode(0);
-                                        }
-                                        if (state == 1) {
-                                            c3d.mntmRandomColoursPtr[0].setSelection(true);
-                                            c3d.getModifier().setRenderMode(1);
-                                        }
-                                        if (state == 2) {
-                                            c3d.mntmCondlineModePtr[0].setSelection(true);
-                                            c3d.getModifier().setRenderMode(6);
-                                        }
-                                        if (state == 3) {
-                                            c3d.mntmWireframeModePtr[0].setSelection(true);
-                                            c3d.getModifier().setRenderMode(-1);
-                                        }
-                                        state++;
+                                    if (!Cocoa.IS_COCOA) {
+                                        // Under Mac OS X open it outside of the dialog.
+                                        openPartReviewFileIn3DEditor();
                                     }
 
                                     Editor3DWindow.getWindow().updateTreeUnsavedEntries();
@@ -2537,6 +2511,19 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
                         Thread.currentThread().interrupt();
                         throw new LDPartEditorException(ie);
                     }
+
+                    if (Cocoa.IS_COCOA && Editor3DWindow.getWindow().isReviewingAPart()) {
+                        // Mac OS X needs some sleep before displaying the part :/
+                        try {
+                            Thread.sleep(3000);
+                        } catch (InterruptedException ie) {
+                            Thread.currentThread().interrupt();
+                            throw new LDPartEditorException(ie);
+                        }
+
+                        // Open the part in the editor
+                        openPartReviewFileIn3DEditor();
+                    }
                 }
             }
 
@@ -3764,4 +3751,37 @@ public static void edger2() {
         }
         regainFocus();
     }
+
+    private static void openPartReviewFileIn3DEditor() {
+        Editor3DWindow.getWindow().openDatFile(Project.getFileToEdit(), OpenInWhat.EDITOR_3D, null);
+        final int viewCount = WorkbenchManager.getUserSettingState().getPartReview3dViewCount();
+        if (viewCount > 1) Editor3DWindow.getRenders().get(0).getC3D().getModifier().splitViewHorizontally();
+        if (viewCount > 2) Editor3DWindow.getRenders().get(0).getC3D().getModifier().splitViewVertically();
+        if (viewCount > 3) Editor3DWindow.getRenders().get(1).getC3D().getModifier().splitViewVertically();
+
+        int state = 0;
+        for (OpenGLRenderer renderer : Editor3DWindow.getRenders()) {
+            Composite3D c3d = renderer.getC3D();
+            WidgetSelectionHelper.unselectAllChildButtons(c3d.mnuRenderMode);
+            if (state == 0) {
+                c3d.mntmNoBFCPtr[0].setSelection(true);
+                c3d.getMntmStudLogo().setSelection(true);
+                c3d.getModifier().switchShowingLogo(true);
+                c3d.getModifier().setRenderMode(0);
+            }
+            if (state == 1) {
+                c3d.mntmRandomColoursPtr[0].setSelection(true);
+                c3d.getModifier().setRenderMode(1);
+            }
+            if (state == 2) {
+                c3d.mntmCondlineModePtr[0].setSelection(true);
+                c3d.getModifier().setRenderMode(6);
+            }
+            if (state == 3) {
+                c3d.mntmWireframeModePtr[0].setSelection(true);
+                c3d.getModifier().setRenderMode(-1);
+            }
+            state++;
+        }
+    }
 }