Skip to content

Enlager border of compare table cell content #2267

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

Merged
mariusheine merged 2 commits into from
Mar 17, 2026
Merged

Enlager border of compare table cell content #2267

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
0c7e11f
Enlager border of compare table cell content
TruongQuangSB Mar 16, 2026
c6a86a1
Revert change border size in Application
TruongQuangSB Mar 16, 2026
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
15 changes: 8 additions & 7 deletions .../org/eclipse/set/feature/table/abstracttableview/ToolboxTableModelThemeConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ private void registerCompareTableCellStyle(
final IConfigRegistry configRegistry) {
final ICellPainter lineBorderDecorator = new LineBorderDecorator(
defaultCellPainter,
new BorderStyle(1, new Color(COMPARE_CELL_BORDER_COLOR),
LineStyleEnum.SOLID));
getCompareTableBorderStyle(LineStyleEnum.SOLID));
configRegistry.registerConfigAttribute(
CellConfigAttributes.CELL_PAINTER, lineBorderDecorator,
DisplayMode.NORMAL,
Expand All @@ -128,9 +127,7 @@ private void registerCompareTableRowStyle(
configRegistry.registerConfigAttribute(
CellConfigAttributes.CELL_PAINTER,
new CustomLineBorderDecorator(defaultCellPainter,
new BorderStyle(1,
new Color(
COMPARE_CELL_BORDER_COLOR),
getCompareTableBorderStyle(
LineStyleEnum.SOLID)),
DisplayMode.NORMAL, label);
});
Expand All @@ -140,13 +137,17 @@ private void registerGuidChangedRowStyle(
final IConfigRegistry configRegistry) {
final CustomLineBorderDecorator customLineBorderDecorator = new CustomLineBorderDecorator(
defaultCellPainter,
new BorderStyle(1, new Color(COMPARE_CELL_BORDER_COLOR),
LineStyleEnum.DASHED));
getCompareTableBorderStyle(LineStyleEnum.DASHED));
configRegistry.registerConfigAttribute(
CellConfigAttributes.CELL_PAINTER, customLineBorderDecorator,
DisplayMode.NORMAL,
ToolboxConstants.TABLE_COMPARE_CHANGED_GUID_ROW_CELL_LABEL);
}

private static BorderStyle getCompareTableBorderStyle(
final LineStyleEnum lineStyle) {
return new BorderStyle(1, new Color(COMPARE_CELL_BORDER_COLOR),
lineStyle);
}

private void registerTopologicalTableCellStyle(
Expand Down
2 changes: 1 addition & 1 deletion java/bundles/org.eclipse.set.feature/rootdir/data/export/pdf/common.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ http://www.eclipse.org/legal/epl-v20.html
</fo:block>
</xsl:template>

<xsl:variable name="compare-content-border-style" select="'0.3mm solid #0066FF'" />
<xsl:variable name="compare-content-border-style" select="'0.5mm solid #0066FF'" />
<xsl:template name="CompareCellContentStyle">
<xsl:choose>
<xsl:when test="CompareProjectContent">
Expand Down
19 changes: 19 additions & 0 deletions java/bundles/org.eclipse.set.utils.table/src/org/eclipse/set/utils/table/TableSpanUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.eclipse.set.model.tablemodel.CellContent;
import org.eclipse.set.model.tablemodel.ColumnDescriptor;
import org.eclipse.set.model.tablemodel.CompareStateCellContent;
import org.eclipse.set.model.tablemodel.CompareTableCellContent;
import org.eclipse.set.model.tablemodel.RowMergeMode;
import org.eclipse.set.model.tablemodel.StringCellContent;
import org.eclipse.set.model.tablemodel.TableRow;
Expand Down Expand Up @@ -140,6 +141,24 @@ private static boolean shouldReplaceValue(final CellContent cellContentA,
}
yield true;
}
case final CompareTableCellContent compareTableCellContentA -> {
if (compareTableCellContentA.getMainPlanCellContent() == null) {
yield false;
}
yield switch (cellContentB) {
case final CompareTableCellContent compareTableCellContentB -> compareTableCellContentB
.getMainPlanCellContent() != null
&& shouldReplaceValue(
compareTableCellContentA
.getMainPlanCellContent(),
compareTableCellContentB
.getMainPlanCellContent());

default -> shouldReplaceValue(
compareTableCellContentA.getMainPlanCellContent(),
cellContentB);
};
}
default -> false;
};
}
Expand Down
Loading