Fix Look and Feel related issues #4002
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
remove gtk l&f from style selection
Siedlerchr
added
the
status: ready-for-review
Siedlerchr
changed the title
Siedlerchr
changed the title
add changelog
Siedlerchr
changed the title
tobiasdiez
approved these changes
May 1, 2018
There was a problem hiding this comment.
The changes look good to me, except one if statement that I don't understand.
Could you please also remove all L&F related code on the maintable-branch. Since now the main display uses JavaFX, there is no need to make the look of the remaining swing dialogs customizable. Especially, if we sometimes run in problems. Just choose a suitable default (Nimbus & plaf.Win ?).
| && !System.getProperty("java.runtime.name").contains("OpenJDK")) { | ||
| // try to avoid ending up with the ugly Metal L&F | ||
| UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel"); | ||
| if (UIManager.getCrossPlatformLookAndFeelClassName().equals(lookFeel) && !GTK_LF_CLASSNAME.equals(lookFeel)) { |
There was a problem hiding this comment.
I don't understand the second test. I thought we want to prevent the GTK L&F by all means....
There was a problem hiding this comment.
You missed the not. We only go with the System look and feel if it's not GTk
Furthermore the migration replaces the stored (if gtk) look and feel.
So we are on the safe due
There was a problem hiding this comment.
ok now I don't understand the complete if statement (and think we can simply delete it).
cases:
- system: gtk ->
lookFeel = Nimbus,if = false - system: win ->
lookFeel = win,if = true(why do we set the l&f to nimbus?!) - system: win, WIN_LOOK_AND_FEEL: win ->
lookFeel = win,if = true(again wrong) - system: gtk, WIN_LOOK_AND_FEEL: gtk ->
lookFeel = gtk,if = false(but we actually wanted to prevent setting it to gtk?!) - system: win, WIN_LOOK_AND_FEEL: gtk ->
lookFeel = gtk,if = false(again, we don't want gtk)
If I understand you correctly, WIN_LOOK_AND_FEEL = gtk can never happen because of the migration, right? In this case we can ignore the last two cases, but even in the first three cases the behavior is odd.
There was a problem hiding this comment.
I simplified the condition. Now the cases should be more clear.
* upstream/master: Fix statement in changelog [WIP] Add Text File Export for "Find Unlinked Files" (#3979)
Siedlerchr
commented
May 2, 2018
| } else { | ||
| lookFeel = systemLookFeel; | ||
| } | ||
| } else { | ||
| lookFeel = Globals.prefs.get(JabRefPreferences.WIN_LOOK_AND_FEEL); | ||
| } | ||
|
|
||
| if (UIManager.getCrossPlatformLookAndFeelClassName().equals(lookFeel) && !GTK_LF_CLASSNAME.equals(lookFeel)) { | ||
| //Prevent metal l&f |
There was a problem hiding this comment.
use Default L&F:
- System L&F = gtk => Nimbus
- System L&F = win => win
- System L&F = metal look and feel
Check cross platform
- Metal look and feel => Nimbus
|
I merge this now, and I will create a PR to remove that L&F stuff completely in maintable-beta |
Siedlerchr
added a commit
that referenced
this pull request
May 4, 2018
* upstream/master: New translations JabRef_en.properties (French) (#4009) Fix Look and Feel related issues (#4002) Fix statement in changelog [WIP] Add Text File Export for "Find Unlinked Files" (#3979) # Conflicts: # src/main/java/org/jabref/JabRefGUI.java # src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java # src/main/java/org/jabref/migrations/PreferencesMigrations.java
Siedlerchr
added a commit
that referenced
this pull request
May 5, 2018
* upstream/maintable-beta: set look and feel to windows, aqua or nimbus for swing in case fix import remove look and feel New translations JabRef_en.properties (French) (#4009) Fix Look and Feel related issues (#4002) Fix statement in changelog [WIP] Add Text File Export for "Find Unlinked Files" (#3979)
Siedlerchr
added a commit
that referenced
this pull request
May 5, 2018
…rsectionnew * upstream/maintable-beta: (88 commits) set look and feel to windows, aqua or nimbus for swing in case fix import remove look and feel New translations JabRef_en.properties (French) (#4009) Fix Look and Feel related issues (#4002) Fix statement in changelog [WIP] Add Text File Export for "Find Unlinked Files" (#3979) Fix IEEE preview does not display month (#3983) Activate context menu on key press (#4004) Improve code layout Fix concurrent modification exception when adding entries to groups Fix build Typo Add fix Rename test Fix #3994 Duplicate unmodifiable list for sorting (#3996) Remove deprecated and unused method (#3993) Improvements around external file types (#3887) Migrate to native gradle test task (#3987) Do not run checkstyle as part of the gradle check task (#3985) ...
Siedlerchr
added a commit
that referenced
this pull request
May 10, 2018
…drop * upstream/maintable-beta: (174 commits) Fix ACM fetcher import of entries (#4019) Reimplement tooltips for file and identifier columns (#4011) Add button-icon for union/intersection in the groups side panel (#3954) Update Dependencies (#4012) set look and feel to windows, aqua or nimbus for swing in case fix import remove look and feel New translations JabRef_en.properties (French) (#4009) Fix Look and Feel related issues (#4002) Fix statement in changelog [WIP] Add Text File Export for "Find Unlinked Files" (#3979) Fix IEEE preview does not display month (#3983) Activate context menu on key press (#4004) Improve code layout Fix concurrent modification exception when adding entries to groups Fix build Typo Add fix Rename test Fix #3994 Duplicate unmodifiable list for sorting (#3996) ... # Conflicts: # src/main/java/org/jabref/gui/actions/CleanupAction.java # src/main/java/org/jabref/gui/maintable/MainTable.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Enabled the change of the L&F for mac.
Remove GTK L&F
Fix migration of old jgoodies l&f
Fixes #3986
Fixes #3995