fix ClassDefinitionRule for dark theme (#179)

SAP · Nov 1, 2023 · f963d85 · f963d85
1 parent 62b7075
commit f963d85
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/com.sap.adt.abapcleaner.gui/src/com/sap/adt/abapcleaner/gui/ConfigComboBox.java b/com.sap.adt.abapcleaner.gui/src/com/sap/adt/abapcleaner/gui/ConfigComboBox.java
@@ -47,7 +47,7 @@ public void widgetSelected(SelectionEvent e) {
       for (String item : items)
       	cboValue.add(item);
       cboValue.select(configValue.getValue());
-}
+   }
 
     @Override
    protected void detachControls() {

diff --git a/com.sap.adt.abapcleaner.gui/src/com/sap/adt/abapcleaner/gui/ConfigLabel.java b/com.sap.adt.abapcleaner.gui/src/com/sap/adt/abapcleaner/gui/ConfigLabel.java
@@ -27,14 +27,16 @@ public Control[] getControlsForHighlight() {
       lblDescription = new Label(parent, SWT.NONE);
       lblDescription.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 3, 1));
       lblDescription.setText(configValue.description);
-      if (configValue.isWarning)
+      if (configValue.isWarning) {
       	lblDescription.setForeground(new Color(255, 0, 0));
+      }
    }
 
    @Override
    protected void detachControls() {
-      if (lblDescription != null)
+      if (lblDescription != null) {
          lblDescription = null;
+      }
    }
 
    @Override
@@ -43,8 +45,13 @@ public void setDefault() {
 
    @Override
    public void setEnabled(boolean enabled) {
-   	lblDescription.setText(enabled ? configValue.description : " ");
-   	if (enabled)
-   		lblDescription.requestLayout();
+   	String newText = enabled ? configValue.description : " ";
+   	// avoid layout request when the Control is first created to avoid issues with background color in dark theme 
+   	if (!newText.equals(lblDescription.getText())) {
+	   	lblDescription.setText(newText);
+	   	if (enabled) {
+	   		lblDescription.requestLayout();
+	   	}
+   	}
    }
 }
diff --git a/com.sap.adt.abapcleaner.gui/src/com/sap/adt/abapcleaner/gui/FrmProfiles.java b/com.sap.adt.abapcleaner.gui/src/com/sap/adt/abapcleaner/gui/FrmProfiles.java
@@ -836,7 +836,7 @@ public void widgetSelected(SelectionEvent e) {
 		new Label(pnlOptionsInfo, SWT.NONE);
 		new Label(pnlOptionsInfo, SWT.NONE);
 		new Label(pnlOptionsInfo, SWT.NONE);
-		
+
 		pnlRuleOptions = new Composite(pnlRule, SWT.NONE);
 		GridLayout gl_pnlRuleOptions = new GridLayout(3, false);
 		gl_pnlRuleOptions.marginWidth = 0;