Browse Source

FL: Get rid of unnecessary call to clip_children().

The idea being to restore compatibility with FLTK 1.1.7...
tags/non-daw-v1.1.0
Jonathan Moore Liles 15 years ago
parent
commit
80278aa78a
3 changed files with 5 additions and 9 deletions
  1. +0
    -2
      FL/Fl_Packscroller.H
  2. +3
    -0
      mixer/src/Controller_Module.C
  3. +2
    -7
      mixer/src/Module.C

+ 0
- 2
FL/Fl_Packscroller.H View File

@@ -41,8 +41,6 @@ public:


Fl_Packscroller ( int X, int Y, int W, int H, const char *L = 0 ) : Fl_Group( X, Y, W, H, L ) Fl_Packscroller ( int X, int Y, int W, int H, const char *L = 0 ) : Fl_Group( X, Y, W, H, L )
{ {
clip_children( 1 );

_increment = 30; _increment = 30;
_yposition = 0; _yposition = 0;




+ 3
- 0
mixer/src/Controller_Module.C View File

@@ -276,6 +276,9 @@ Controller_Module::connect_to ( Port *p )
} }
else else
{ {
/* HACK: hide label */
w->labeltype( FL_NO_LABEL );

w->resize( x(), y(), this->w(), h() ); w->resize( x(), y(), this->w(), h() );
add( w ); add( w );
resizable( w ); resizable( w );


+ 2
- 7
mixer/src/Module.C View File

@@ -105,7 +105,6 @@ Module::init ( void )


box( FL_UP_BOX ); box( FL_UP_BOX );
labeltype( FL_NO_LABEL ); labeltype( FL_NO_LABEL );
clip_children( 1 );
set_visible_focus(); set_visible_focus();
selection_color( FL_RED ); selection_color( FL_RED );
} }
@@ -320,11 +319,8 @@ Module::draw_box ( void )
ty = y(); ty = y();
tx = x(); tx = x();


// bbox( tx, ty, tw, th );

fl_push_clip( tx, ty, tw, th ); fl_push_clip( tx, ty, tw, th );



Fl_Color c = is_default() ? FL_BLACK : color(); Fl_Color c = is_default() ? FL_BLACK : color();


c = active() && ! bypass() ? c : fl_inactive( c ); c = active() && ! bypass() ? c : fl_inactive( c );
@@ -349,10 +345,9 @@ Module::draw_box ( void )
fl_draw_box( FL_ROUNDED_BOX, tx + tw - 8, ty + 4, 5, 5, is_controlling() ? FL_YELLOW : fl_inactive( FL_YELLOW ) ); fl_draw_box( FL_ROUNDED_BOX, tx + tw - 8, ty + 4, 5, 5, is_controlling() ? FL_YELLOW : fl_inactive( FL_YELLOW ) );
} }


fl_pop_clip();
// box( FL_NO_BOX );

Fl_Group::draw_children(); Fl_Group::draw_children();

fl_pop_clip();
} }


void void


Loading…
Cancel
Save