Skip to content

Disable gradients in Form by default #121

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
merged 1 commit into from
Jun 10, 2022
Merged

Disable gradients in Form by default #121

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
20 changes: 10 additions & 10 deletions bundles/org.eclipse.ui.forms/src/org/eclipse/ui/forms/FormColors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ else if (testTwoPrimaryColors(listSelection, 120, 256)
// LIST_SELECTION foreground colour
// Examples: Win High Con Black, Win High Con #1, Win High Con #2
// (covered in the second part of the OR clause above)
createColor(IFormColors.TITLE, rgb);
createColor(IFormColors.TITLE, getSystemColor(SWT.COLOR_WIDGET_FOREGROUND));
}

private void createTwistieColors() {
Expand All @@ -547,7 +547,7 @@ private void createTwistieColors() {
}

private void createTitleBarGradientColors() {
RGB tbBg = getSystemColor(SWT.COLOR_TITLE_BACKGROUND);
RGB tbBg = getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW);
RGB bg = getImpliedBackground().getRGB();

// Group 1
Expand Down Expand Up @@ -578,15 +578,15 @@ else if (testTwoPrimaryColors(tbBg, 120, 180))
tbBg = blend(tbBg, bg, 10);
}

createColor(IFormColors.TB_BG, tbBg);
createColor(IFormColors.TB_BG, getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));

// for backward compatibility
createColor(TB_GBG, tbBg);
createColor(TB_GBG, getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
}

private void createTitleBarOutlineColors() {
// title bar outline - border color
RGB tbBorder = getSystemColor(SWT.COLOR_TITLE_BACKGROUND);
RGB tbBorder = getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW);
RGB bg = getImpliedBackground().getRGB();
// Group 1
// Rule: If at least 2 of the RGB values are equal to or between 180 and
Expand Down Expand Up @@ -643,7 +643,7 @@ private void createFormHeaderColors() {
}

private void createFormHeaderGradientColors() {
RGB titleBg = getSystemColor(SWT.COLOR_TITLE_BACKGROUND);
RGB titleBg = getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW);
Color bgColor = getImpliedBackground();
RGB bg = bgColor.getRGB();
RGB bottom, top;
Expand Down Expand Up @@ -680,12 +680,12 @@ else if (testTwoPrimaryColors(titleBg, 120, 180)) {
bottom = blend(titleBg, bg, 10);
top = bg;
}
createColor(IFormColors.H_GRADIENT_END, top);
createColor(IFormColors.H_GRADIENT_START, bottom);
createColor(IFormColors.H_GRADIENT_END, getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
createColor(IFormColors.H_GRADIENT_START, getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));
}

private void createFormHeaderKeylineColors() {
RGB titleBg = getSystemColor(SWT.COLOR_TITLE_BACKGROUND);
RGB titleBg = getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW);
Color bgColor = getImpliedBackground();
RGB bg = bgColor.getRGB();
RGB keyline2;
Expand Down Expand Up @@ -723,7 +723,7 @@ else if (testTwoPrimaryColors(titleBg, 120, 180))
}

private void createFormHeaderDNDColors() {
RGB titleBg = getSystemColor(SWT.COLOR_TITLE_BACKGROUND_GRADIENT);
RGB titleBg = getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW);
Color bgColor = getImpliedBackground();
RGB bg = bgColor.getRGB();
RGB light, full;
Expand Down
1 change: 1 addition & 0 deletions bundles/org.eclipse.ui.forms/src/org/eclipse/ui/forms/widgets/FormToolkit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,7 @@ public Section createSection(Composite parent, int sectionStyle) {
|| (sectionStyle & ExpandableComposite.SHORT_TITLE_BAR) != 0) {
colors.initializeSectionToolBarColors();
section.setTitleBarBackground(colors.getColor(IFormColors.TB_BG));
section.setTitleBarGradientBackground(section.getTitleBarBackground()); // disable gradient by default
section.setTitleBarBorderColor(colors
.getColor(IFormColors.TB_BORDER));
}
Expand Down