Mercurial Mercurial > hg > stx-libwidg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix prev fix from cg. Send setupDimensions only if scrolledView
authorStefan Vogel <sv@exept.de>
Wed, 19 Mar 1997 16:43:47 +0100
changeset 1135 acdeed6efc13
parent 1134 f4f1e67f1ff2
child 1136 03b7ccb2710c
Fix prev fix from cg. Send setupDimensions only if scrolledView is set.
ScrView.st file | annotate | diff | comparison | revisions
ScrollableView.st file | annotate | diff | comparison | revisions 
--- a/ScrView.st	Wed Mar 19 15:17:44 1997 +0100
+++ b/ScrView.st	Wed Mar 19 16:43:47 1997 +0100
@@ -612,8 +612,11 @@
         newView scrolledView:aScrolledView.
     ].
 
+<<<<<<< ScrView.st
+=======
 "/    newView setupDimensions.
 
+>>>>>>> 1.53
     org notNil ifTrue:[
         newView origin:org
     ].
@@ -642,7 +645,12 @@
      top open
     "
 
+<<<<<<< ScrView.st
+    "Modified: 6.3.1997 / 18:42:40 / cg"
+    "Modified: 19.3.1997 / 15:32:51 / stefan"
+=======
     "Modified: 19.3.1997 / 15:16:37 / cg"
+>>>>>>> 1.53
 !
 
 forView:aView in:aSuperView
@@ -855,7 +863,12 @@
         ].
     ]
 
+<<<<<<< ScrView.st
+    "Modified: 7.3.1997 / 22:24:43 / cg"
+    "Modified: 19.3.1997 / 15:32:37 / stefan"
+=======
     "Modified: 19.3.1997 / 15:08:18 / cg"
+>>>>>>> 1.53
 !
 
 verticalScrollBar
@@ -1043,13 +1056,25 @@
         ].
 
         anyChange ifTrue:[
+<<<<<<< ScrView.st
+            realized ifTrue:[
+                self setupDimensions.
+            ].
+        ].
+=======
             realized ifTrue:[
                 self setupDimensions.
             ]
         ]
+>>>>>>> 1.53
     ].
 
+<<<<<<< ScrView.st
+    "Modified: 7.3.1997 / 22:58:56 / cg"
+    "Modified: 19.3.1997 / 15:33:36 / stefan"
+=======
     "Modified: 19.3.1997 / 15:09:23 / cg"
+>>>>>>> 1.53
 ! !
 
 !ScrollableView methodsFor:'event processing'!
@@ -1204,6 +1229,7 @@
      changes; do it now
     "
     scrolledView notNil ifTrue:[
+        self setupDimensions.
         vScrollBar notNil ifTrue:[
             vScrollBar setThumbFor:scrolledView
         ].
@@ -1214,7 +1240,12 @@
 
     self updateScrollBarVisibility
 
+<<<<<<< ScrView.st
+    "Modified: 7.3.1997 / 22:22:33 / cg"
+    "Modified: 19.3.1997 / 15:32:20 / stefan"
+=======
     "Modified: 19.3.1997 / 15:07:56 / cg"
+>>>>>>> 1.53
 !
 
 releaseHorizontalScrollBar
@@ -1709,5 +1740,5 @@
 !ScrollableView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ScrView.st,v 1.53 1997-03-19 14:17:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ScrView.st,v 1.54 1997-03-19 15:43:47 stefan Exp $'
 ! !
--- a/ScrollableView.st	Wed Mar 19 15:17:44 1997 +0100
+++ b/ScrollableView.st	Wed Mar 19 16:43:47 1997 +0100
@@ -612,8 +612,11 @@
         newView scrolledView:aScrolledView.
     ].
 
+<<<<<<< ScrView.st
+=======
 "/    newView setupDimensions.
 
+>>>>>>> 1.53
     org notNil ifTrue:[
         newView origin:org
     ].
@@ -642,7 +645,12 @@
      top open
     "
 
+<<<<<<< ScrView.st
+    "Modified: 6.3.1997 / 18:42:40 / cg"
+    "Modified: 19.3.1997 / 15:32:51 / stefan"
+=======
     "Modified: 19.3.1997 / 15:16:37 / cg"
+>>>>>>> 1.53
 !
 
 forView:aView in:aSuperView
@@ -855,7 +863,12 @@
         ].
     ]
 
+<<<<<<< ScrView.st
+    "Modified: 7.3.1997 / 22:24:43 / cg"
+    "Modified: 19.3.1997 / 15:32:37 / stefan"
+=======
     "Modified: 19.3.1997 / 15:08:18 / cg"
+>>>>>>> 1.53
 !
 
 verticalScrollBar
@@ -1043,13 +1056,25 @@
         ].
 
         anyChange ifTrue:[
+<<<<<<< ScrView.st
+            realized ifTrue:[
+                self setupDimensions.
+            ].
+        ].
+=======
             realized ifTrue:[
                 self setupDimensions.
             ]
         ]
+>>>>>>> 1.53
     ].
 
+<<<<<<< ScrView.st
+    "Modified: 7.3.1997 / 22:58:56 / cg"
+    "Modified: 19.3.1997 / 15:33:36 / stefan"
+=======
     "Modified: 19.3.1997 / 15:09:23 / cg"
+>>>>>>> 1.53
 ! !
 
 !ScrollableView methodsFor:'event processing'!
@@ -1204,6 +1229,7 @@
      changes; do it now
     "
     scrolledView notNil ifTrue:[
+        self setupDimensions.
         vScrollBar notNil ifTrue:[
             vScrollBar setThumbFor:scrolledView
         ].
@@ -1214,7 +1240,12 @@
 
     self updateScrollBarVisibility
 
+<<<<<<< ScrView.st
+    "Modified: 7.3.1997 / 22:22:33 / cg"
+    "Modified: 19.3.1997 / 15:32:20 / stefan"
+=======
     "Modified: 19.3.1997 / 15:07:56 / cg"
+>>>>>>> 1.53
 !
 
 releaseHorizontalScrollBar
@@ -1709,5 +1740,5 @@
 !ScrollableView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ScrollableView.st,v 1.53 1997-03-19 14:17:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ScrollableView.st,v 1.54 1997-03-19 15:43:47 stefan Exp $'
 ! !
hg/stx-libwidg