Skip to content

ExpandableComposite does not resize upon collapse #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vsennedot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ExpandableComposite does not resize upon collapse #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Shell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,11 @@ public void removeShellListener( ShellListener listener ) {
removeListener( SWT.Activate, listener );
removeListener( SWT.Deactivate, listener );
}

@Override
public void requestLayout () {
layout (null, SWT.DEFER);
}

///////////
// Disposal
Expand Down
31 changes: 30 additions & 1 deletion bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/forms/widgets/ExpandableComposite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.eclipse.swt.widgets.Layout;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.forms.events.ExpansionEvent;
import org.eclipse.ui.forms.events.HyperlinkAdapter;
import org.eclipse.ui.forms.events.HyperlinkEvent;
Expand Down Expand Up @@ -880,7 +881,7 @@ protected void internalSetExpanded(boolean expanded) {
getDescriptionControl().setVisible(expanded);
if (client != null)
client.setVisible(expanded);
layout();
reflow();
}
}

Expand Down Expand Up @@ -1117,4 +1118,32 @@ private void programmaticToggleState() {
// if (toggle.isFocusControl())
// gc.drawFocus(0, 0, size.x, size.y);
// }

void reflow() {
Composite c = this;
while (c != null) {
c.setRedraw(false);
c = c.getParent();
if (c instanceof SharedScrolledComposite || c instanceof Shell) {
break;
}
}
c = this;
while (c != null) {
c.requestLayout();
c = c.getParent();
if (c instanceof SharedScrolledComposite) {
((SharedScrolledComposite) c).reflow(true);
break;
}
}
c = this;
while (c != null) {
c.setRedraw(true);
c = c.getParent();
if (c instanceof SharedScrolledComposite || c instanceof Shell) {
break;
}
}
}
}
26 changes: 1 addition & 25 deletions bundles/org.eclipse.rap.ui.forms/src/org/eclipse/ui/forms/widgets/Section.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,31 +125,7 @@ protected void internalSetExpanded(boolean expanded) {
* SharedScrolledComposite is reached.
*/
protected void reflow() {
Composite c = this;
while (c != null) {
c.setRedraw(false);
c = c.getParent();
if (c instanceof SharedScrolledComposite || c instanceof Shell) {
break;
}
}
c = this;
while (c != null) {
c.layout(true);
c = c.getParent();
if (c instanceof SharedScrolledComposite) {
((SharedScrolledComposite) c).reflow(true);
break;
}
}
c = this;
while (c != null) {
c.setRedraw(true);
c = c.getParent();
if (c instanceof SharedScrolledComposite || c instanceof Shell) {
break;
}
}
super.reflow();
}

/**
Expand Down