From 682c62e55975d4f7fce318a9818fe292cb325818 Mon Sep 17 00:00:00 2001 From: DRC Date: Mon, 13 Jan 2025 12:49:56 -0500 Subject: [PATCH] Viewer: Remove vestigial code (irrelevant since 84c6e8cf62362871052235e3e0cf75b3809db13e) --- java/com/turbovnc/vncviewer/Viewport.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/java/com/turbovnc/vncviewer/Viewport.java b/java/com/turbovnc/vncviewer/Viewport.java index 70649156c..88680db6e 100644 --- a/java/com/turbovnc/vncviewer/Viewport.java +++ b/java/com/turbovnc/vncviewer/Viewport.java @@ -60,10 +60,7 @@ public Viewport(CConn cc_) { if (Utils.getBooleanProperty("turbovnc.lionfs", true)) enableLionFS(); } - // NOTE: If Lion FS mode is enabled, then the viewport is only created once - // as a non-full-screen viewport, so we tell showToolbar() to ignore the - // full-screen state. - showToolbar(cc.params.toolbar.get(), canDoLionFS); + showToolbar(cc.params.toolbar.get()); final Viewport vp = this; addWindowFocusListener(new WindowAdapter() { @@ -288,12 +285,10 @@ public Object invoke(Object proxy, Method method, Object[] args) { cc.params.fullScreen.set(true); cc.menu.fullScreen.setSelected(cc.params.fullScreen.get()); updateMacMenuFS(); - showToolbar(cc.params.toolbar.get()); } else if (method.getName().equals("windowExitingFullScreen")) { cc.params.fullScreen.set(false); cc.menu.fullScreen.setSelected(cc.params.fullScreen.get()); updateMacMenuFS(); - showToolbar(cc.params.toolbar.get()); } else if (method.getName().equals("windowEnteredFullScreen")) { cc.sizeWindow(); } @@ -409,10 +404,8 @@ public void setVisible(boolean visible) { } } - public void showToolbar(boolean show) { showToolbar(show, false); } - - private void showToolbar(boolean show, boolean force) { - tb.setVisible(show && (!cc.params.fullScreen.get() || force)); + public void showToolbar(boolean show) { + tb.setVisible(show && !cc.params.fullScreen.get()); } public void updateTitle() {