Re: heatbug probe sizes

[Marcus G. Daniels]

>>>>> "RLR" == Rick Riolo <address@hidden> writes:

RLR> The probe display is as
RLR> wide as my screen and it won't let me make it bigger (even if I
RLR> slide it to one side and try to expand to the other side). 

I think the only difference is that some methods were added to SwarmObject,
and this makes the ClassDisplayWidgets take up more space.

RLR> And there is no horizontal slide bar so I can't get at it that way.

Ok, now there is...  Also added is a maximum frame width.

diff -c -r swarm-1.0.5/src/simtools/CommonProbeDisplay.h 
swarm-1.0.5-rlr/src/simtools/CommonProbeDisplay.h
*** swarm-1.0.5/src/simtools/CommonProbeDisplay.h       Fri Jan 16 13:11:45 1998
--- swarm-1.0.5-rlr/src/simtools/CommonProbeDisplay.h   Sat Jan 24 13:43:27 1998
***************
*** 10,15 ****
--- 10,16 ----
    id probedObject;  
    id topLevel, topFrame, canvas;
  
+   BOOL horizontalScrollbarFlag;
    BOOL removeRef;
    BOOL markedForDropFlag;
    ref_t objectRef;
diff -c -r swarm-1.0.5/src/simtools/CommonProbeDisplay.m 
swarm-1.0.5-rlr/src/simtools/CommonProbeDisplay.m
*** swarm-1.0.5/src/simtools/CommonProbeDisplay.m       Fri Jan 16 13:11:45 1998
--- swarm-1.0.5-rlr/src/simtools/CommonProbeDisplay.m   Sat Jan 24 13:43:13 1998
***************
*** 25,31 ****
    c_Frame =  [Frame createParent: topLevel]; 
  
    canvas = [Canvas createParent: c_Frame];
!   tkobjc_configureProbeCanvas (canvas);
  
    [c_Frame pack];
  
--- 25,31 ----
    c_Frame =  [Frame createParent: topLevel]; 
  
    canvas = [Canvas createParent: c_Frame];
!   tkobjc_configureProbeCanvas (canvas, horizontalScrollbarFlag);
  
    [c_Frame pack];
  
diff -c -r swarm-1.0.5/src/simtools/CompleteProbeDisplay.m 
swarm-1.0.5-rlr/src/simtools/CompleteProbeDisplay.m
*** swarm-1.0.5/src/simtools/CompleteProbeDisplay.m     Fri Jan 16 13:11:45 1998
--- swarm-1.0.5-rlr/src/simtools/CompleteProbeDisplay.m Sat Jan 24 13:44:03 1998
***************
*** 50,56 ****
    id classList;
    id index;
    id previous;
! 
    [super createEnd];
  
    maxwidth = 0;
--- 50,57 ----
    id classList;
    id index;
    id previous;
!   
!   horizontalScrollbarFlag = YES;
    [super createEnd];
  
    maxwidth = 0;
diff -c -r swarm-1.0.5/src/tkobjc/control.h swarm-1.0.5-rlr/src/tkobjc/control.h
*** swarm-1.0.5/src/tkobjc/control.h    Fri Jan 16 13:11:53 1998
--- swarm-1.0.5-rlr/src/tkobjc/control.h        Sat Jan 24 13:47:23 1998
***************
*** 9,15 ****
  int tkobjc_doOneEventAsync (void);
  void tkobjc_registerCommand (id object, const char *name);
  void tkobjc_createWindow (id topFrame);
! void tkobjc_configureProbeCanvas (id canvas);
  void tkobjc_configureHideButton (id owner, id hideB, id raisedFrame);
  
  void tkobjc_bindButton3ForCompleteProbeDisplay (id widget,
--- 9,15 ----
  int tkobjc_doOneEventAsync (void);
  void tkobjc_registerCommand (id object, const char *name);
  void tkobjc_createWindow (id topFrame);
! void tkobjc_configureProbeCanvas (id canvas, BOOL horizontalScrollbarFlag);
  void tkobjc_configureHideButton (id owner, id hideB, id raisedFrame);
  
  void tkobjc_bindButton3ForCompleteProbeDisplay (id widget,
diff -c -r swarm-1.0.5/src/tkobjc/control.m swarm-1.0.5-rlr/src/tkobjc/control.m
*** swarm-1.0.5/src/tkobjc/control.m    Fri Jan 16 13:11:53 1998
--- swarm-1.0.5-rlr/src/tkobjc/control.m        Sat Jan 24 13:47:43 1998
***************
*** 37,57 ****
  }
  
  void
! tkobjc_configureProbeCanvas (id canvas)
  {
!   id c_Frame = [canvas getParent];
  
!   [globalTkInterp eval: 
!    "%s configure -width 10 -height 10 -yscrollcommand {%s.yscroll set} ; \
!     scrollbar %s.yscroll -orient vertical -command {%s yview} ; \
!     pack %s.yscroll -side right -fill y ; \
!     pack %s -side left -fill both  -expand true",
!     [canvas getWidgetName],
!     [c_Frame getWidgetName],
!     [c_Frame getWidgetName],
!     [canvas getWidgetName],
!     [c_Frame getWidgetName],
!     [canvas getWidgetName]];
  }
  
  void
--- 37,79 ----
  }
  
  void
! tkobjc_configureProbeCanvas (id canvas, BOOL horizontalScrollbarFlag)
  {
!   const char *canvasName = [canvas getWidgetName];
!   const char *frameName = [[canvas getParent] getWidgetName];
  
!   if (horizontalScrollbarFlag)
!     [globalTkInterp
!       eval: "%s configure "
!       "-xscrollcommand {%s.xscroll set} "
!       "-yscrollcommand {%s.yscroll set};"
!       "scrollbar %s.xscroll -orient horizontal -command {%s xview} ;"
!       "scrollbar %s.yscroll -orient vertical -command {%s yview} ;"
!       "pack %s.xscroll -side bottom -fill x ;"
!       "pack %s.yscroll -side right -fill y ;"
!       "pack %s -side left -fill both -expand true ;"
!       "pack %s -side top -fill both -expand true",
!       canvasName,
!       frameName, frameName,   // [x,y]scrollcommand
!       frameName, canvasName,  // scrollbar x, xview
!       frameName, canvasName,  // scrollbar y, yview
!       frameName, frameName,   // pack xscroll, yscroll
!       canvasName,             // pack canvas
!       frameName               // pack frame
!     ];
!   else
!     [globalTkInterp
!       eval:
!         "%s configure -width 10 -height 10 -yscrollcommand {%s.yscroll set} ;"
!       "scrollbar %s.yscroll -orient vertical -command {%s yview} ;"
!       "pack %s.yscroll -side right -fill y ;"
!       "pack %s -side left -fill both -expand true",
!       canvasName,
!       frameName,
!       frameName,
!       canvasName,
!       frameName,
!       canvasName];
  }
  
  void
***************
*** 415,433 ****
  tkobjc_assertGeometry (id topFrame)
  {
    id canvas = [topFrame getParent];
!   
    [globalTkInterp eval:
                      "tkwait visibility %s ;"
                    "set width [winfo width %s] ;"
                    "set height [winfo height %s] ;"
                    "%s configure -scrollregion [list 0 0 $width $height] ;"
                    "if {$height > 500} {set height 500} ;"
                    "%s configure -width $width -height $height",
!                   [topFrame getWidgetName],
!                   [topFrame getWidgetName],
!                   [topFrame getWidgetName],
!                   [canvas getWidgetName],
!                   [canvas getWidgetName]];
  }
  
  void
--- 437,455 ----
  tkobjc_assertGeometry (id topFrame)
  {
    id canvas = [topFrame getParent];
!   const char *frameName = [topFrame getWidgetName];
!   const char *canvasName = [canvas getWidgetName];
! 
    [globalTkInterp eval:
                      "tkwait visibility %s ;"
                    "set width [winfo width %s] ;"
                    "set height [winfo height %s] ;"
                    "%s configure -scrollregion [list 0 0 $width $height] ;"
                    "if {$height > 500} {set height 500} ;"
+                   "if {$width > 809} {set width 809} ;"
                    "%s configure -width $width -height $height",
!                   frameName, frameName, frameName,
!                   canvasName, canvasName];
  }
  
  void

                  ==================================
   Swarm-Support is for discussion of the technical details of the day
   to day usage of Swarm.  For list administration needs (esp.
   [un]subscribing), please send a message to <address@hidden>
   with "help" in the body of the message.
                  ==================================