# HG changeset patch # User Stefan Vogel # Date 1470739726 -7200 # Node ID d4a5b7bf3021b805a9574cb8bd14bf277ee55b29 # Parent be1d9fbaa48d45c5ee73ec6872ac65b6499c12e7 #REFACTORING by stefan class: NoteBookView diff -r be1d9fbaa48d -r d4a5b7bf3021 NoteBookView.st --- a/NoteBookView.st Tue Aug 09 12:47:13 2016 +0200 +++ b/NoteBookView.st Tue Aug 09 12:48:46 2016 +0200 @@ -1,5 +1,3 @@ -"{ Encoding: utf8 }" - " COPYRIGHT (c) 1997 by eXept Software AG All Rights Reserved @@ -3650,7 +3648,7 @@ label:aLabelOrTabItem on:aView "initialize attributes" - label := aLabelOrTabItem. + label := aLabelOrTabItem. (aLabelOrTabItem isKindOf:TabItem) ifTrue:[ tabItem := aLabelOrTabItem. printableLabel := tabItem rawLabel. @@ -3675,9 +3673,9 @@ labelOrTabItem:aLabelOrTabItem on:aView "initialize attributes" - label := aLabelOrTabItem. + label := aLabelOrTabItem. (aLabelOrTabItem isKindOf:TabItem) ifTrue:[ - "/ CG: iff the only need for the view in a tabItem is to get the atributes, + "/ CG: iff the only need for the view in a tabItem is to get the attributes, "/ then we should do things here (see below). "/ Q to ca: is this correct ??? tabItem := aLabelOrTabItem. @@ -3911,23 +3909,23 @@ !NoteBookView::Tab methodsFor:'private'! -getPrintableLabelFor:aGC +getPrintableLabelFor:aView printableLabel notNil ifTrue:[ printableLabel isImageOrForm ifTrue:[ - printableLabel := printableLabel onDevice:(aGC device) + printableLabel := printableLabel onDevice:(aView device) ] ifFalse:[ printableLabel isString ifTrue:[ - printableLabel := self resolveDisplayStringFor:printableLabel on:aGC. + printableLabel := self resolveDisplayStringFor:printableLabel on:aView. ] ifFalse:[ - printableLabel class == LabelAndIcon ifTrue:[ - printableLabel string:(self resolveDisplayStringFor:(printableLabel string) on:aGC) + printableLabel isLabelAndIcon ifTrue:[ + printableLabel string:(self resolveDisplayStringFor:(printableLabel string) on:aView) ] ]. ] ] ifFalse:[ printableLabel := '' ]. - extent := (printableLabel widthOn:aGC) @ (printableLabel heightOn:aGC). + extent := (printableLabel widthOn:aView) @ (printableLabel heightOn:aView). "Created: / 06-09-2006 / 16:45:31 / cg" !