Browse Source

fix setup() to not hide label

David Rose 20 years ago
parent
commit
81a9887d4b
1 changed files with 10 additions and 10 deletions
  1. 10 10
      panda/src/pgui/pgButton.cxx

+ 10 - 10
panda/src/pgui/pgButton.cxx

@@ -198,16 +198,6 @@ setup(const string &label) {
   PT(PandaNode) rollover = new PandaNode("rollover");
   PT(PandaNode) rollover = new PandaNode("rollover");
   PT(PandaNode) inactive = new PandaNode("inactive");
   PT(PandaNode) inactive = new PandaNode("inactive");
 
 
-  get_state_def(S_ready).attach_new_node(ready);
-  get_state_def(S_depressed).attach_new_node(depressed);
-  get_state_def(S_rollover).attach_new_node(rollover);
-  get_state_def(S_inactive).attach_new_node(inactive);
-
-  ready->add_child(geom);
-  depressed->add_child(geom);
-  rollover->add_child(geom);
-  inactive->add_child(geom);
-
   PGFrameStyle style;
   PGFrameStyle style;
   style.set_color(0.8f, 0.8f, 0.8f, 1.0f);
   style.set_color(0.8f, 0.8f, 0.8f, 1.0f);
   style.set_width(0.1f, 0.1f);
   style.set_width(0.1f, 0.1f);
@@ -226,6 +216,16 @@ setup(const string &label) {
   style.set_color(0.8f, 0.8f, 0.8f, 1.0f);
   style.set_color(0.8f, 0.8f, 0.8f, 1.0f);
   set_frame_style(S_depressed, style);
   set_frame_style(S_depressed, style);
   depressed->set_transform(TransformState::make_pos(LVector3f(0.05f, 0.0f, -0.05f)));
   depressed->set_transform(TransformState::make_pos(LVector3f(0.05f, 0.0f, -0.05f)));
+
+  get_state_def(S_ready).attach_new_node(ready);
+  get_state_def(S_depressed).attach_new_node(depressed);
+  get_state_def(S_rollover).attach_new_node(rollover);
+  get_state_def(S_inactive).attach_new_node(inactive);
+
+  ready->add_child(geom);
+  depressed->add_child(geom);
+  rollover->add_child(geom);
+  inactive->add_child(geom);
 }
 }
 
 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////