Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-06 14:00:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

replaced MetalRootPaneUI on Windows and Linux (issue #47)

Browse Source 
(preparation for replacing "base" Metal LaF with BasicLookAndFeel)
This commit is contained in:
Karl Tauber
2020-02-18 12:52:53 +01:00
parent 004a5cb765
commit 790f490674
5 changed files with 51 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsRemover.java
View File

@@ -72,6 +72,15 @@ class UIDefaultsRemover
"RadioButton.select",
"RadioButton.totalInsets",
"RootPane.colorChooserDialogBorder",
"RootPane.errorDialogBorder",
"RootPane.fileChooserDialogBorder",
"RootPane.frameBorder",
"RootPane.informationDialogBorder",
"RootPane.plainDialogBorder",
"RootPane.questionDialogBorder",
"RootPane.warningDialogBorder",
"ScrollBar.darkShadow",
"ScrollBar.highlight",
"ScrollBar.shadow",

38
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRootPaneUI.java Normal file
View File

@@ -0,0 +1,38 @@
/*
* Copyright 2020 FormDev Software GmbH
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.formdev.flatlaf.ui;
import javax.swing.JComponent;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicRootPaneUI;
/**
* Provides the Flat LaF UI delegate for {@link javax.swing.JRootPane}.
*
* @author Karl Tauber
*/
public class FlatRootPaneUI
extends BasicRootPaneUI
{
private static ComponentUI instance;
public static ComponentUI createUI( JComponent c ) {
if( instance == null )
instance = new FlatRootPaneUI();
return instance;
}
}

2
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
View File

@@ -39,6 +39,8 @@ PopupMenuSeparatorUI=com.formdev.flatlaf.ui.FlatPopupMenuSeparatorUI
ProgressBarUI=com.formdev.flatlaf.ui.FlatProgressBarUI
RadioButtonUI=com.formdev.flatlaf.ui.FlatRadioButtonUI
RadioButtonMenuItemUI=com.formdev.flatlaf.ui.FlatRadioButtonMenuItemUI
[win]RootPaneUI=com.formdev.flatlaf.ui.FlatRootPaneUI
[linux]RootPaneUI=com.formdev.flatlaf.ui.FlatRootPaneUI
ScrollBarUI=com.formdev.flatlaf.ui.FlatScrollBarUI
ScrollPaneUI=com.formdev.flatlaf.ui.FlatScrollPaneUI
SeparatorUI=com.formdev.flatlaf.ui.FlatSeparatorUI

10
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt
View File

@@ -1031,7 +1031,6 @@ Resizable.resizeBorder [lazy] 4,4,4,4 false com.formdev.flatlaf.ui.F
RootPane.ancestorInputMap [lazy] 2 javax.swing.plaf.InputMapUIResource [UI]
pressed CONTEXT_MENU postPopup
shift pressed F10 postPopup
RootPane.colorChooserDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$QuestionDialogBorder [UI]
RootPane.defaultButtonWindowKeyBindings length=8 [Ljava.lang.Object;
[0] ENTER
[1] press
@@ -1041,14 +1040,7 @@ RootPane.defaultButtonWindowKeyBindings length=8 [Ljava.lang.Object;
[5] press
[6] ctrl released ENTER
[7] release
RootPane.errorDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$ErrorDialogBorder [UI]
RootPane.fileChooserDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$QuestionDialogBorder [UI]
RootPane.frameBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$FrameBorder [UI]
RootPane.informationDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$DialogBorder [UI]
RootPane.plainDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$DialogBorder [UI]
RootPane.questionDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$QuestionDialogBorder [UI]
RootPane.warningDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$WarningDialogBorder [UI]
RootPaneUI javax.swing.plaf.metal.MetalRootPaneUI
RootPaneUI com.formdev.flatlaf.ui.FlatRootPaneUI
#---- ScrollBar ----

10
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt
View File

@@ -1033,7 +1033,6 @@ Resizable.resizeBorder [lazy] 4,4,4,4 false com.formdev.flatlaf.ui.F
RootPane.ancestorInputMap [lazy] 2 javax.swing.plaf.InputMapUIResource [UI]
pressed CONTEXT_MENU postPopup
shift pressed F10 postPopup
RootPane.colorChooserDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$QuestionDialogBorder [UI]
RootPane.defaultButtonWindowKeyBindings length=8 [Ljava.lang.Object;
[0] ENTER
[1] press
@@ -1043,14 +1042,7 @@ RootPane.defaultButtonWindowKeyBindings length=8 [Ljava.lang.Object;
[5] press
[6] ctrl released ENTER
[7] release
RootPane.errorDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$ErrorDialogBorder [UI]
RootPane.fileChooserDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$QuestionDialogBorder [UI]
RootPane.frameBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$FrameBorder [UI]
RootPane.informationDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$DialogBorder [UI]
RootPane.plainDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$DialogBorder [UI]
RootPane.questionDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$QuestionDialogBorder [UI]
RootPane.warningDialogBorder [lazy] 5,5,5,5 false javax.swing.plaf.metal.MetalBorders$WarningDialogBorder [UI]
RootPaneUI javax.swing.plaf.metal.MetalRootPaneUI
RootPaneUI com.formdev.flatlaf.ui.FlatRootPaneUI
#---- ScrollBar ----