Skip to content

[gtk] Make standard colors static final #1764

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
Mar 19, 2025
Merged

[gtk] Make standard colors static final #1764

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
50 changes: 24 additions & 26 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Device.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,30 @@ public abstract class Device implements Drawable {
* Programmer's Reference as the colors in the default
* palette.
*/
Color COLOR_BLACK, COLOR_DARK_RED, COLOR_DARK_GREEN, COLOR_DARK_YELLOW, COLOR_DARK_BLUE;
Color COLOR_DARK_MAGENTA, COLOR_DARK_CYAN, COLOR_GRAY, COLOR_DARK_GRAY, COLOR_RED, COLOR_TRANSPARENT;
Color COLOR_GREEN, COLOR_YELLOW, COLOR_BLUE, COLOR_MAGENTA, COLOR_CYAN, COLOR_WHITE;
static final Color COLOR_BLACK, COLOR_DARK_RED, COLOR_DARK_GREEN, COLOR_DARK_YELLOW, COLOR_DARK_BLUE;
static final Color COLOR_DARK_MAGENTA, COLOR_DARK_CYAN, COLOR_GRAY, COLOR_DARK_GRAY, COLOR_RED, COLOR_TRANSPARENT;
static final Color COLOR_GREEN, COLOR_YELLOW, COLOR_BLUE, COLOR_MAGENTA, COLOR_CYAN, COLOR_WHITE;

static {
/* Create the standard colors */
COLOR_TRANSPARENT = new Color (0xFF, 0xFF,0xFF,0);
COLOR_BLACK = new Color (0, 0,0);
COLOR_DARK_RED = new Color (0x80, 0,0);
COLOR_DARK_GREEN = new Color (0, 0x80,0);
COLOR_DARK_YELLOW = new Color (0x80, 0x80,0);
COLOR_DARK_BLUE = new Color (0, 0,0x80);
COLOR_DARK_MAGENTA = new Color (0x80, 0,0x80);
COLOR_DARK_CYAN = new Color (0, 0x80,0x80);
COLOR_GRAY = new Color (0xC0, 0xC0,0xC0);
COLOR_DARK_GRAY = new Color (0x80, 0x80,0x80);
COLOR_RED = new Color (0xFF, 0,0);
COLOR_GREEN = new Color (0, 0xFF,0);
COLOR_YELLOW = new Color (0xFF, 0xFF,0);
COLOR_BLUE = new Color (0, 0,0xFF);
COLOR_MAGENTA = new Color (0xFF, 0,0xFF);
COLOR_CYAN = new Color (0, 0xFF,0xFF);
COLOR_WHITE = new Color (0xFF, 0xFF,0xFF);
}

/* System Font */
Font systemFont;
Expand Down Expand Up @@ -662,25 +683,6 @@ protected void init () {
}
}

/* Create the standard colors */
COLOR_TRANSPARENT = new Color (0xFF, 0xFF,0xFF,0);
COLOR_BLACK = new Color (0, 0,0);
COLOR_DARK_RED = new Color (0x80, 0,0);
COLOR_DARK_GREEN = new Color (0, 0x80,0);
COLOR_DARK_YELLOW = new Color (0x80, 0x80,0);
COLOR_DARK_BLUE = new Color (0, 0,0x80);
COLOR_DARK_MAGENTA = new Color (0x80, 0,0x80);
COLOR_DARK_CYAN = new Color (0, 0x80,0x80);
COLOR_GRAY = new Color (0xC0, 0xC0,0xC0);
COLOR_DARK_GRAY = new Color (0x80, 0x80,0x80);
COLOR_RED = new Color (0xFF, 0,0);
COLOR_GREEN = new Color (0, 0xFF,0);
COLOR_YELLOW = new Color (0xFF, 0xFF,0);
COLOR_BLUE = new Color (0, 0,0xFF);
COLOR_MAGENTA = new Color (0xFF, 0,0xFF);
COLOR_CYAN = new Color (0, 0xFF,0xFF);
COLOR_WHITE = new Color (0xFF, 0xFF,0xFF);

emptyTab = OS.pango_tab_array_new(1, false);
if (emptyTab == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.pango_tab_array_set_tab(emptyTab, 0, OS.PANGO_TAB_LEFT, 1);
Expand Down Expand Up @@ -980,10 +982,6 @@ protected void release () {
if (systemFont != null) systemFont.dispose ();
systemFont = null;

COLOR_BLACK = COLOR_DARK_RED = COLOR_DARK_GREEN = COLOR_DARK_YELLOW = COLOR_DARK_BLUE =
COLOR_DARK_MAGENTA = COLOR_DARK_CYAN = COLOR_GRAY = COLOR_DARK_GRAY = COLOR_RED =
COLOR_GREEN = COLOR_YELLOW = COLOR_BLUE = COLOR_MAGENTA = COLOR_CYAN = COLOR_WHITE = null;

if (emptyTab != 0) OS.pango_tab_array_free(emptyTab);
emptyTab = 0;

Expand Down
4 changes: 2 additions & 2 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1449,8 +1449,8 @@ public long internal_new_GC (GCData data) {
}
}
data.device = device;
data.foregroundRGBA = device.COLOR_BLACK.handle;
data.backgroundRGBA = device.COLOR_WHITE.handle;
data.foregroundRGBA = Device.COLOR_BLACK.handle;
data.backgroundRGBA = Device.COLOR_WHITE.handle;
data.font = device.systemFont;
data.image = this;
}
Expand Down
Loading