| commit | d7c5c9f3d629e9fb4fe75f5e723d9a70e7a14dc5 | [log] [tgz] |
|---|---|---|
| author | Stephan Wahlbrink <sw@wahlbrink.eu> | Mon Jun 28 15:41:58 2021 +0200 |
| committer | Stephan Wahlbrink <sw@wahlbrink.eu> | Mon Jun 28 23:21:23 2021 +0200 |
| tree | c3e79750547efa989684628bfe61e4d1c9b8c71e | |
| parent | b5d7b529d5c5d32b6a0f108f0b12af0a68189622 [diff] |
Bug 574504: [UI-Actions] Fix resizing of SearchContributionItem Change-Id: I42e0c93054bc1a90730c01c31fd6ac6caca020fe
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/actions/SearchContributionItem.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/actions/SearchContributionItem.java index 9a7115c..2ed5764 100644 --- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/actions/SearchContributionItem.java +++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/actions/SearchContributionItem.java
@@ -162,7 +162,11 @@ this.textItem.setWidth(width); toolBarParent.layout(new @NonNull Control[] { this.control }); - toolBarParent.pack(true); + if ((this.options & VIEW_TOOLBAR) != 0) { + toolBarParent.pack(true); + final var viewComposite= nonNullAssert(toolBarParent.getParent()); + viewComposite.layout(new @NonNull Control[] { toolBarParent }); + } } }
diff --git a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/PageBookBrowserPage.java b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/PageBookBrowserPage.java index 86315eb..a80318b 100644 --- a/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/PageBookBrowserPage.java +++ b/ecommons/org.eclipse.statet.ecommons.uimisc/src/org/eclipse/statet/ecommons/ui/mpbv/PageBookBrowserPage.java
@@ -207,7 +207,8 @@ public void show() { final GridData gd= (GridData)this.toolBar.getLayoutData(); gd.exclude= false; - this.toolBar.getParent().layout(true, true); + this.toolBar.getParent().layout(new @NonNull Control[] { this.toolBar }); + this.searchTextItem.getSearchText().setFocus(); }