Browse Source

redesigned the sliderbar a little bit

Asad M. Zaman 20 years ago
parent
commit
c27ec35667
2 changed files with 14 additions and 8 deletions
  1. 4 4
      direct/src/gui/DirectSliderBar.py
  2. 10 4
      panda/src/pgui/pgSliderBar.cxx

+ 4 - 4
direct/src/gui/DirectSliderBar.py

@@ -75,7 +75,7 @@ class DirectSliderBar(DirectFrame):
             #figure out what is happening?????
             #self.guiItem.setState(0)
             #self.guiItem.clearStateDef(0)
-            self.guiItem.setFrame(-3.0, 3.0, -0.25, 0.25)
+            self.guiItem.setFrame(-3.0, 3.0, -0.125, 0.125)
             self.barStyle.setWidth(0.05, 0.05)
             self.barStyle.setColor(0.6,0.6,0.6,1)
             self.barStyle.setType(PGFrameStyle.TBevelIn)
@@ -90,9 +90,9 @@ class DirectSliderBar(DirectFrame):
 
         self.guiItem.setActive(1)
 
-        self.barStyle.setColor(0.8,0.8,0.8,1)
-        self.barStyle.setType(PGFrameStyle.TBevelOut)
-        self.updateBarStyle()
+        #self.barStyle.setColor(0.8,0.8,0.8,1)
+        #self.barStyle.setType(PGFrameStyle.TBevelOut)
+        #self.updateBarStyle()
 
         if (self['command'] != None):
             # Attach command function to slider button movement

+ 10 - 4
panda/src/pgui/pgSliderBar.cxx

@@ -152,10 +152,12 @@ setup(float width, float height, float range) {
   }
     
   _slider->set_slider_bar(this);
-  _slider->setup(_slider->get_name());
+  //_slider->setup(_slider->get_name());
+  _slider->setup("");
   _slider->set_drag_n_drop(true);
+  _slider->set_frame(-1,1,-1.5,1.5);
   _slider_button.set_scale(_scale);
-  _slider_button.set_pos(0, 0, -_scale*0.5); // center it
+  _slider_button.set_pos(0, 0, 0); // center it
 
   // if left or right button to control slider desired, create them
   if (!_slider_only) {
@@ -172,15 +174,19 @@ setup(float width, float height, float range) {
   }
 
   PGFrameStyle style;
-  style.set_width(0.05f, 0.05f);
+  style.set_width(0.3f, 0.3f);
 
+  /*
   style.set_color(0.6f, 0.6f, 0.6f, 1.0f);
   style.set_type(PGFrameStyle::T_bevel_in);
   //set_frame_style(0, style);
+  */
 
   style.set_color(0.8f, 0.8f, 0.8f, 1.0f);
   style.set_type(PGFrameStyle::T_bevel_out);
-  //set_bar_style(style);
+  _slider->set_frame_style(PGButton::S_ready, style);
+  style.set_type(PGFrameStyle::T_bevel_in);
+  _slider->set_frame_style(PGButton::S_depressed, style);
 }
 
 ////////////////////////////////////////////////////////////////////