Commit 5b3e6515 authored by Michael Schwarz's avatar Michael Schwarz

boxes large enough to contain all content

parent 24da6c0e
......@@ -43,7 +43,7 @@ import de.tum.in.www2.cupplugin.views.PrecedenceToInsert.PrecedenceCyclicExcepti
class ConflictPanel extends Composite {
private final CupConflictsView cupConflictsView;
private static final int BASE_HEIGHT = 85;
private static final int BASE_HEIGHT = 100;
private static final int COLUMNS = 3;
private static final int HEADING_FONT_SIZE = 14;
......@@ -239,6 +239,7 @@ class ConflictPanel extends Composite {
symbolLabel.setText(symbolsBuilder.toString());
detailText.setText(makeReduceReduceDetailText(rrc,linkCounter));
gridData.heightHint += detailText.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
resolutionOptions.setVisible(false);
resolutionButton.setVisible(false);
......@@ -300,9 +301,10 @@ class ConflictPanel extends Composite {
}
if (conflict2ItemAst != null)
builder.append("</a>");
if (i != size - 1)
if (i != size - 1) {
builder.append(", ");
// gridData.heightHint += SIZE_INCREASE_PER_LINE;
gridData.heightHint += 10;
}
}
return builder.toString();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment