From: Hannu Niemistö Date: Mon, 31 Jul 2017 06:29:21 +0000 (+0300) Subject: Merge "LabelDecorator.decorateLabel can return null" X-Git-Tag: v1.31.0~264^2~20 X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=fe1a2f532761669e67da4db4ae15096ced8a04db;hp=6c13a0fe40ac29598b401abded6460285c95c3c8 Merge "LabelDecorator.decorateLabel can return null" --- diff --git a/bundles/org.simantics.modeling.ui/scl/Simantics/Testing/BrowseContext.scl b/bundles/org.simantics.modeling.ui/scl/Simantics/Testing/BrowseContext.scl index a662f57f4..436557f31 100644 --- a/bundles/org.simantics.modeling.ui/scl/Simantics/Testing/BrowseContext.scl +++ b/bundles/org.simantics.modeling.ui/scl/Simantics/Testing/BrowseContext.scl @@ -97,7 +97,7 @@ importJava "org.simantics.browsing.ui.content.LabelDecorator" where Decorates the given label with the name of the UI column which the label is for and the index of this label within its parenting INodeContext. Returns the decorated Label """ - decorateLabel :: LabelDecorator -> String -> String -> Integer -> String + decorateLabel :: LabelDecorator -> String -> String -> Integer -> Maybe String decorateForeground :: LabelDecorator -> a -> String -> Integer -> a decorateBackground :: LabelDecorator -> a -> String -> Integer -> a decorateFont :: LabelDecorator -> Maybe a -> String -> Integer -> Maybe a