Merge pull request #7451 from matthiasblaesing/cleanup_context_action2

Cleanup ContextAction and fix TerminalAction behavior
apache · Jul 18, 2024 · 9b1b308 · 9b1b308
2 parents 3add6af + c4f10c8
commit 9b1b308
Show file tree

Hide file tree

Showing 8 changed files with 184 additions and 105 deletions.
diff --git a/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerTabbed.java b/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerTabbed.java
@@ -268,8 +268,18 @@ private class PopupListener extends MouseUtils.PopupMouseAdapter {
 
 	@Override
 	protected void showPopup(MouseEvent e) {
-	    Terminal selected = (Terminal) getSelected();
-
+            Terminal selected = null;
+            if (e.getSource() == tabbedPane) {
+                int tabIndex = tabbedPane.indexAtLocation(e.getX(), e.getY());
+                if(tabIndex >= 0) {
+                    selected = (Terminal) tabbedPane.getComponentAt(tabIndex);
+                }
+            }
+
+            if (selected == null) {
+                selected = (Terminal) getSelected();
+            }
+
 	    Action close = ActionFactory.forID(ActionFactory.CLOSE_ACTION_ID);
 	    Action setTitle = ActionFactory.forID(ActionFactory.SET_TITLE_ACTION_ID);
 	    Action pin = ActionFactory.forID(ActionFactory.PIN_TAB_ACTION_ID);
@@ -285,7 +295,7 @@ protected void showPopup(MouseEvent e) {
 			null,
 			setTitle,
 			pin
-		    }, Lookups.fixed(getSelected())
+		    }, Lookups.fixed(selected)
 	    );
 	    menu.show(TerminalContainerTabbed.this, e.getX(), e.getY());
 	}

diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/CloseButtonTabbedPane.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/CloseButtonTabbedPane.java
@@ -267,6 +267,12 @@ public void setTitleAt(int idx, String title) {
         }
 
         super.setTitleAt(idx, title);
+        // Force update of the special "CloseButton" UI. It was observed, that
+        // after a change to an empty title changing to a title with content
+        // only works when the surrounding component is resized, forcing a
+        // revalidation of the terminal
+        getTabComponentAt(idx).revalidate();
+        getTabComponentAt(idx).repaint();
     }
 
     private Component findTabAt(int index) {