Skip to content

Commit 634755c

Browse files
Merge pull request #189 from vincenzopalazzo/development
fix: fixed the window title color when the paint is up to the library
2 parents 2d33137 + ff37639 commit 634755c

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

Diff for: changelog.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"package_name": "material-ui-swing",
3-
"version": "v1.1.3-rc2",
3+
"version": "v1.1.4-rc1",
44
"api": {
55
"name": "github",
66
"repository": "vincenzopalazzo/material-ui-swing",
77
"branch": "master"
88
},
99
"generation_method": {
10-
"name": "metadata",
10+
"name": "semver-v2",
1111
"header_filter": false
1212
},
1313
"serialization_method": {
1414
"name": "md"
1515
}
16-
}
16+
}

Diff for: gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
GROUP_ID=io.github.vincenzopalazzo
22
ARTIFACT_ID=material-ui-swing
33
#VERSION=1.1.2-rc2-SNAPSHOT
4-
VERSION=1.1.3-rc2-SNAPSHOT
4+
VERSION=1.1.4-rc1-SNAPSHOT
55
MODULE_NAME=io.github.vincenzopalazzo.materialuiswing
6-
RELEASE_ENABLE=false
6+
RELEASE_ENABLE=true
77
org.gradle.caching=true
88

99
#Information abaut the maven repository

Diff for: pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>io.github.vincenzopalazzo</groupId>
66
<artifactId>material-ui-swing</artifactId>
7-
<version>1.1.3-rc2-SNAPSHOT</version>
7+
<version>1.1.3-rc3-SNAPSHOT</version>
88
<inceptionYear>2020</inceptionYear>
99
<licenses>
1010
<license>

Diff for: src/main/java/mdlaf/MaterialLookAndFeel.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -709,16 +709,18 @@ protected void initComponentDefaults(UIDefaults table) {
709709
table.put("InternalFrame.activeTitleBackground", theme.getBackgroundPrimary());
710710
table.put("InternalFrame.activeTitleForeground", theme.getTextColor());
711711
table.put("InternalFrame.inactiveTitleBackground", theme.getBackgroundPrimary());
712-
table.put("InternalFrame.inactiveTitleForeground", theme.getDisableTextColor());
712+
table.put("InternalFrame.inactiveTitleForeground", theme.getTextColor());
713713
table.put("InternalFrame.titleFont", theme.getFontBold());
714714
table.put("InternalFrame.background", theme.getBackgroundPrimary());
715715
table.put("InternalFrame.border", MaterialBorders.DEFAULT_SHADOW_BORDER);
716716

717717
// This is for change the TitlePane
718-
table.put("Material.activeCaption", theme.getMenuBackground());
719-
table.put("Material.inactiveCaption", theme.getMenuBackground());
718+
// FIXME: we may take in consideration to support the Dialog with new properties
719+
// because there use use case that these only are not enough.
720+
table.put("Material.activeCaption", theme.getBackgroundPrimary());
721+
table.put("Material.inactiveCaption", theme.getBackgroundPrimary());
720722
table.put("Material.activeCaptionText", theme.getTextColor());
721-
table.put("Material.inactiveCaptionText", theme.getDisableTextColor());
723+
table.put("Material.inactiveCaptionText", theme.getTextColor());
722724
table.put(
723725
"Material.activeCaptionBorder",
724726
new BorderUIResource(BorderFactory.createLineBorder(theme.getBackgroundPrimary())));

0 commit comments

Comments
 (0)