# HG changeset patch # User Jan Vrany # Date 1629407718 -3600 # Node ID 8d5c522fb553c347b20aad2582b6048bb222c8f1 # Parent e00dd2ef4b292d3dee83a7f3ce1eb2b51ba28ba6 `NoteBookView`: take `DefaultActiveTabMarkerFgColor` from stylesheet ...rather than hard-coding it! The hardcoded value is used as a default for backward compatibility, although it'd be more sensible to use `DefaultActiveTabMarkerColor` as default. diff -r e00dd2ef4b29 -r 8d5c522fb553 NoteBookView.st --- a/NoteBookView.st Thu Aug 19 10:46:10 2021 +0100 +++ b/NoteBookView.st Thu Aug 19 22:15:18 2021 +0100 @@ -1,6 +1,7 @@ " COPYRIGHT (c) 1997 by eXept Software AG COPYRIGHT (c) 2017 Jan Vrany + COPYRIGHT (c) 2021 LabWare All Rights Reserved This software is furnished under a license and may be used @@ -56,6 +57,7 @@ " COPYRIGHT (c) 1997 by eXept Software AG COPYRIGHT (c) 2017 Jan Vrany + COPYRIGHT (c) 2021 LabWare All Rights Reserved This software is furnished under a license and may be used @@ -163,7 +165,7 @@ #'noteBook.activeForegroundColor' #'noteBook.activeBackgroundColor' #'noteBook.lightColor' #'noteBook.halfLightColor' #'noteBook.shadowColor' #'noteBook.halfShadowColor' #'noteBook.edgeStyle' - #'noteBook.activeTabMarkerColor' + #'noteBook.activeTabMarkerColor' #'noteBook.activeTabMarkerColor2' #'noteBook.showRemoveTabIcon' )> @@ -209,7 +211,13 @@ DefaultActiveTabMarkerColor isNil ifTrue:[ DefaultActiveTabMarkerFgColor := nil. ] ifFalse:[ - DefaultActiveTabMarkerFgColor := Color redByte:255 greenByte:138 blueByte:41. + "/ Originally, a hard-coded color was assigned to + "/ DefaultActiveTabMarkerFgColor. Why the hell the color + "/ was NOT taken from stylesheet? Sigh. + + "/ DefaultActiveTabMarkerFgColor := Color redByte:255 greenByte:138 blueByte:41. + DefaultActiveTabMarkerFgColor := StyleSheet colorAt:#'noteBook.activeTabMarkerColor2' + default:[Color redByte:255 greenByte:138 blueByte:41] ]. ((StyleSheet at:#'noteBook.showRemoveTabIcon' default:true) @@ -225,6 +233,8 @@ " self updateStyleCache " + + "Modified (format): / 19-08-2021 / 22:12:57 / Jan Vrany " ! ! !NoteBookView class methodsFor:'image specs'!