1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8263977: GTK L&F: Cleanup duplicate checks in GTKStyle and GTKLookAndFeel

Browse Source 
Reviewed-by: serb, pbansal, kizune
This commit is contained in:
Aleksey Shipilev 2021-03-23 06:54:27 +00:00
parent 57d8f1d09c
commit df01b15b8b
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -249,7 +249,6 @@ public class GTKLookAndFeel extends SynthLookAndFeel {
region == Region.SPINNER || region == Region.SPINNER ||
region == Region.TABLE || region == Region.TABLE ||
region == Region.TEXT_AREA || region == Region.TEXT_AREA ||
region == Region.TEXT_FIELD ||
region == Region.TEXT_PANE || region == Region.TEXT_PANE ||
region == Region.TREE); region == Region.TREE);
} }

5
src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -166,8 +166,7 @@ class GTKStyle extends SynthStyle implements GTKConstants {
id == Region.TABBED_PANE_TAB || id == Region.TABBED_PANE_TAB ||
id == Region.TOGGLE_BUTTON || id == Region.TOGGLE_BUTTON ||
id == Region.TOOL_TIP || id == Region.TOOL_TIP ||
id == Region.MENU_ITEM_ACCELERATOR || id == Region.MENU_ITEM_ACCELERATOR)) {
id == Region.TABBED_PANE_TAB)) {
type = ColorType.FOREGROUND; type = ColorType.FOREGROUND;
} else if (id == Region.TABLE || } else if (id == Region.TABLE ||
id == Region.LIST || id == Region.LIST ||