Skip to content
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

Revert "Fix eclipse-platform/eclipse.platform#1173 - bad UI on MacOS merge viewer" #869

Merged
merged 2 commits into from
Nov 23, 2023
Merged

Revert "Fix eclipse-platform/eclipse.platform#1173 - bad UI on MacOS merge viewer" #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c22e36e
Revert "Fix eclipse-platform/eclipse.platform#1173 - bad UI on MacOS …
sratz Nov 20, 2023
534c362
Add output.. to build.properties to work around Tycho problem
sratz Nov 20, 2023
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
1 change: 1 addition & 0 deletions team/bundles/org.eclipse.compare/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# IBM Corporation - initial API and implementation
###############################################################################
source.. = compare/
output.. = bin/
bin.includes = icons/,\
plugin.xml,\
.,\
Expand Down
20 changes: 4 additions & 16 deletions ...rg.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Layout;
import org.eclipse.swt.widgets.Sash;
import org.eclipse.swt.widgets.Shell;
Expand Down Expand Up @@ -127,15 +126,8 @@ public abstract class ContentMergeViewer extends ContentViewer

private class ContentMergeViewerLayout extends Layout {
@Override
public Point computeSize(Composite composite, int wHint, int hHint, boolean force) {
if (hHint > SWT.DEFAULT && wHint > SWT.DEFAULT) {
return new Point(wHint, hHint);
}

Rectangle r = composite.getClientArea();


return new Point(r.width, r.height);
public Point computeSize(Composite c, int w, int h, boolean force) {
return new Point(100, 100);
}

@Override
Expand Down Expand Up @@ -805,12 +797,8 @@ private void internalRefresh(Object input) {
ToolBarManager tbm = (ToolBarManager) getToolBarManager(fComposite.getParent());
if (tbm != null ) {
updateToolItems();
Display.getDefault().asyncExec(() -> {
// relayout in next tick
tbm.update(true);
tbm.getControl().getParent().setRedraw(true);
});

tbm.update(true);
tbm.getControl().getParent().layout(true);
}
}
}
Expand Down
Loading