Changeset 26 for trunk/Classes/widgets/scrollbar.cpp

Timestamp:

2010-05-28 07:39:52 (2 years ago)

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/widgets/scrollbar.cpp (modified) (12 diffs)

trunk/Classes/widgets/scrollbar.cpp

@@ -26 +26 @@
 
 namespace {
-    const std::string scrollbar_top = "buttons/scrolltop.png";
-    const std::string scrollbar_bottom = "buttons/scrollbottom.png";
-    const std::string scrollbar_mid = "buttons/scrollmid.png";
-
-    const std::string scrollbar_top_hl = "buttons/scrolltop-active.png";
-    const std::string scrollbar_bottom_hl = "buttons/scrollbottom-active.png";
-    const std::string scrollbar_mid_hl = "buttons/scrollmid-active.png";
-
-    const std::string groove_top = "buttons/scrollgroove-top.png";
-    const std::string groove_mid = "buttons/scrollgroove-mid.png";
-    const std::string groove_bottom = "buttons/scrollgroove-bottom.png";
+    const std::string scrollbar_top = "buttons/scrolltop2.png";
+    const std::string scrollbar_bottom = "buttons/scrollbottom2.png";
+    const std::string scrollbar_mid = "buttons/scrollmid2.png";
+
+    const std::string scrollbar_top_hl = "buttons/scrolltop2.png"; //"buttons/scrolltop-active.png";
+    const std::string scrollbar_bottom_hl = "buttons/scrollbottom2.png"; //"buttons/scrollbottom-active.png";
+    const std::string scrollbar_mid_hl = "buttons/scrollmid2.png"; //"buttons/scrollmid-active.png";
+
+    const std::string groove_top = "buttons/scrollgroove-top2.png";
+    const std::string groove_mid = "buttons/scrollgroove-mid2.png";
+    const std::string groove_bottom = "buttons/scrollgroove-bottom2.png";
 
 }
@@ -61 +61 @@
 {
     handler_vector h;
-    h.push_back(&uparrow_);
-    h.push_back(&downarrow_);
+//  h.push_back(&uparrow_);
+//  h.push_back(&downarrow_);
     return h;
 }
@@ -68 +68 @@
 void scrollbar::update_location(SDL_Rect const &rect)
 {
-    int uh = uparrow_.height(), dh = downarrow_.height();
-    uparrow_.set_location(rect.x, rect.y);
-    downarrow_.set_location(rect.x, rect.y + rect.h - dh);
+    //int uh = uparrow_.height(), dh = downarrow_.height();
+    int uh = 0, dh = 0;
+    //uparrow_.set_location(rect.x, rect.y);
+    //downarrow_.set_location(rect.x, rect.y + rect.h - dh);
     SDL_Rect r = rect;
     r.y += uh;
@@ -76 +77 @@
 
     widget::update_location(r);
-    //bg_register(r);
 }
 
@@ -82 +82 @@
 {
     widget::hide(value);
-    uparrow_.hide(value);
-    downarrow_.hide(value);
+//  uparrow_.hide(value);
+//  downarrow_.hide(value);
 }
 
@@ -103 +103 @@
         return;
     grip_position_ = pos;
-    uparrow_.enable(grip_position_ != 0);
-    downarrow_.enable(grip_position_ < full_height_ - grip_height_);
+//  uparrow_.enable(grip_position_ != 0);
+//  downarrow_.enable(grip_position_ < full_height_ - grip_height_);
     set_dirty();
 }
@@ -160 +160 @@
 bool scrollbar::is_valid_height(int height) const
 {
-    int uh = uparrow_.height();
-    int dh = downarrow_.height();
+    int uh = 0; //uparrow_.height();
+    int dh = 0; //downarrow_.height();
     if(uh + dh >= height) {
         return false;
@@ -181 +181 @@
 void scrollbar::process_event()
 {
-    if (uparrow_.pressed())
-        scroll_up();
-
-    if (downarrow_.pressed())
-        scroll_down();
+//  if (uparrow_.pressed())
+//      scroll_up();
+//
+//  if (downarrow_.pressed())
+//      scroll_down();
 }
 
@@ -191 +191 @@
 {
     SDL_Rect loc = location();
-    int uh = uparrow_.height();
-    int dh = downarrow_.height();
+    int uh = 0; //uparrow_.height();
+    int dh = 0; //downarrow_.height();
     if(uh + dh >= loc.h) {
         loc.h = 0;
@@ -269 +269 @@
 //  surface const screen = video().getSurface();
 
+    // KP: leave a little more space
+    groove.x += 4;
+    grip.x += 4;
+    
     // Draw scrollbar "groove"
     blit_surface(groove.x, groove.y, top_grv);
@@ -287 +291 @@
         return;
 
+// KP: no longer handle scrollbar events
+/*
     STATE new_state = state_;
     SDL_Rect const &grip = grip_area();
@@ -347 +353 @@
     }
     state_ = new_state;
+*/
 }