rndk 0.2.0 → 1.0.0

data/lib/rndk/label.rb

@@ -11,56 +11,77 @@ module RNDK
 
     # Creates a Label Widget.
     #
-    # * `xplace` is the x position - can be an integer or `RNDK::LEFT`,
+    # * `x` is the x position - can be an integer or `RNDK::LEFT`,
     #   `RNDK::RIGHT`, `RNDK::CENTER`.
-    # * `yplace` is the y position - can be an integer or `RNDK::TOP`,
+    # * `y` is the y position - can be an integer or `RNDK::TOP`,
     #   `RNDK::BOTTOM`, `RNDK::CENTER`.
-    # * `message` is an Array of Strings with all the lines you'd want
-    #   to show. RNDK markup applies (see RNDK#Markup).
+    # * `message` is an Array of Strings with all the lines you'd
+    #   want to show. RNDK markup applies (see RNDK#Markup).
     # * `box` if the Widget is drawn with a box outside it.
     # * `shadow` turns on/off the shadow around the Widget.
     #
     # If the Widget cannot be created, returns `nil`.
-    def initialize(rndkscreen, xplace, yplace, mesg, box, shadow)
-      return nil if mesg.class != Array or mesg.empty?
-
+    def initialize(screen, config={})
       super()
-      rows = mesg.size
+      @widget_type = :label
+      @supported_signals += [:before_message_change]
+
+      # This is UGLY AS HELL
+      # But I don't have time to clean this up right now
+      # (lots of widgets, you know)  :(
+      x      = 0
+      y      = 0
+      text   = "label"
+      box    = true
+      shadow = false
+
+      config.each do |key, val|
+        x      = val if key == :x
+        y      = val if key == :y
+        text   = val if key == :text
+        box    = val if key == :box
+        shadow = val if key == :shadow
+      end
+      # End of darkness
+
+      # Adjusting if the user sent us a String
+      text = [text] if text.class == String
+      return nil if text.class != Array or text.empty?
+      rows = text.size
 
-      parent_width  = Ncurses.getmaxx rndkscreen.window
-      parent_height = Ncurses.getmaxy rndkscreen.window
+      parent_width  = Ncurses.getmaxx screen.window
+      parent_height = Ncurses.getmaxy screen.window
       box_width  = -2**30  # -INFINITY
       box_height = 0
-      xpos = [xplace]
-      ypos = [yplace]
-      x = 0
+      x = [x]
+      y = [y]
 
       self.set_box box
       box_height = rows + 2*@border_size
 
-      @info = []
-      @info_len = []
-      @info_pos = []
+      @text = []
+      @text_len = []
+      @text_pos = []
 
       # Determine the box width.
       (0...rows).each do |x|
 
         # Translate the string to a chtype array
-        info_len = []
-        info_pos = []
-        @info << RNDK.char2Chtype(mesg[x], info_len, info_pos)
-        @info_len << info_len[0]
-        @info_pos << info_pos[0]
+        text_len = []
+        text_pos = []
+        @text << RNDK.char2Chtype(text[x], text_len, text_pos)
+        @text_len << text_len[0]
+        @text_pos << text_pos[0]
 
-        box_width = [box_width, @info_len[x]].max
+        box_width = [box_width, @text_len[x]].max
       end
       box_width += 2 * @border_size
 
       # Create the string alignments.
       (0...rows).each do |x|
-        @info_pos[x] = RNDK.justifyString(box_width - 2*@border_size,
-                                          @info_len[x],
-                                          @info_pos[x])
+        @text_pos[x] = RNDK.justifyString(box_width - 2*@border_size,
+                                          @text_len[x],
+                                          @text_pos[x])
       end
 
       # Make sure we didn't extend beyond the dimensions of the window.
@@ -74,20 +95,23 @@ module RNDK
                    end
 
       # Rejustify the x and y positions if we need to
-      RNDK.alignxy(rndkscreen.window, xpos, ypos, box_width, box_height)
-
-      @screen = rndkscreen
-      @parent = rndkscreen.window
-      @win    = Ncurses.newwin(box_height, box_width, ypos[0], xpos[0])
-      @shadow_win = nil
-      @xpos = xpos[0]
-      @ypos = ypos[0]
-      @rows = rows
+      RNDK.alignxy(screen.window, x, y, box_width, box_height)
+
+      @screen = screen
+      @parent = screen.window
+      @win    = Ncurses.newwin(box_height,
+                               box_width,
+                               y[0],
+                               x[0])
+      @shadow_win   = nil
+      @x            = x[0]
+      @y            = y[0]
+      @rows         = rows
       @box_width    = box_width
       @box_height   = box_height
       @input_window = @win
-      @has_focus = false
-      @shadow    = shadow
+      @has_focus    = false
+      @shadow       = shadow
 
       if @win.nil?
         self.destroy
@@ -100,77 +124,83 @@ module RNDK
       if shadow
         @shadow_win = Ncurses.newwin(box_height,
                                      box_width,
-                                     ypos[0] + 1,
-                                     xpos[0] + 1)
+                                     y[0] + 1,
+                                     x[0] + 1)
       end
 
       # Register this
-      rndkscreen.register(:label, self)
+      screen.register(@widget_type, self)
     end
 
     # Obsolete entrypoint which calls Label#draw.
     def activate(actions=[])
-      self.draw @box
+      self.draw
     end
 
     # Sets multiple attributes of the Widget.
     #
     # See Label#initialize.
-    def set(mesg, box)
-      self.set_message mesg
-      self.set_box box
+    def set(config)
+      # This is UGLY ATTRIBUTESS HELL
+      # But I don't have time to clean this up right now
+      # (lots of widgets, you know)  :(
+      text   = @text
+      box    = @box
+      shadow = @shadow
+
+      config.each do |key, val|
+        text   = val if key == :text
+        box    = val if key == :box
+        shadow = val if key == :shadow
+      end
+
+      self.set_message text if text != @text
+      self.set_box box      if box  != @box
     end
 
     # Sets the contents of the Label Widget.
-    # @note `info` is an Array of Strings.
-    def set_message info
-      return if info.class != Array or info.empty?
+    # @note `text` is an Array of Strings.
+    def set_message text
+      return if text.class != Array or text.empty?
+
+      keep_going = self.run_signal_binding(:before_message_change)
+      return if not keep_going
 
-      info_size = info.size
       # Clean out the old message.
       (0...@rows).each do |x|
-        @info[x]     = ''
-        @info_pos[x] = 0
-        @info_len[x] = 0
+        @text[x]     = ''
+        @text_pos[x] = 0
+        @text_len[x] = 0
       end
 
-      @rows = if info_size < @rows
-              then info_size
+      @rows = if text.size < @rows
+              then text.size
               else @rows
               end
 
       # Copy in the new message.
       (0...@rows).each do |x|
-        info_len = []
-        info_pos = []
-        @info[x] = RNDK.char2Chtype(info[x], info_len, info_pos)
-        @info_len[x] = info_len[0]
-        @info_pos[x] = RNDK.justifyString(@box_width - 2 * @border_size,
-                                          @info_len[x],
-                                          info_pos[0])
+        text_len = []
+        text_pos = []
+        @text[x] = RNDK.char2Chtype(text[x], text_len, text_pos)
+        @text_len[x] = text_len[0]
+        @text_pos[x] = RNDK.justifyString(@box_width - 2 * @border_size,
+                                          @text_len[x],
+                                          text_pos[0])
       end
 
       # Redraw the label widget.
       self.erase
-      self.draw @box
+      self.draw
     end
 
     # Returns current contents of the Widget.
-    def get_message(size)
-      size << @rows
-      return @info
-    end
-
-    def object_type
-      :label
-    end
-
-    def position
-      super(@win)
+    def get_message
+      @text
     end
 
     # Sets the background attribute/color of the widget.
-    def set_bg_attrib attrib
+    def set_bg_color attrib
       Ncurses.wbkgd(@win, attrib)
     end
 
@@ -188,12 +218,12 @@ module RNDK
       # Draw in the message.
       (0...@rows).each do |x|
         Draw.writeChtype(@win,
-                         @info_pos[x] + @border_size,
+                         @text_pos[x] + @border_size,
                          x + @border_size,
-                         @info[x],
+                         @text[x],
                          RNDK::HORIZONTAL,
                          0,
-                         @info_len[x])
+                         @text_len[x])
       end
 
       Ncurses.wrefresh @win
@@ -211,9 +241,9 @@ module RNDK
       RNDK.window_delete @shadow_win
       RNDK.window_delete @win
 
-      self.clean_bindings :label
+      self.clean_bindings
 
-      RNDK::Screen.unregister(:label, self)
+      @screen.unregister self
     end
 
     # Waits for the user to press a key.
@@ -235,6 +265,10 @@ module RNDK
       code
     end
 
+    def position
+      super(@win)
+    end
+
   end
 end
 

data/lib/rndk/radio.rb

@@ -1,41 +1,64 @@
 require 'rndk/scroller'
 
 module RNDK
-  class RADIO < SCROLLER
-    def initialize(rndkscreen, xplace, yplace, splace, height, width, title,
-        list, list_size, choice_char, def_item, highlight, box, shadow)
+
+  class Radio < Scroller
+
+    def initialize(screen, config={})
       super()
-      parent_width = Ncurses.getmaxx(rndkscreen.window)
-      parent_height = Ncurses.getmaxy(rndkscreen.window)
+      @widget_type = :radio
+      @supported_signals += [:before_input, :after_input]
+
+      x           = 0
+      y           = 0
+      splace      = RNDK::RIGHT
+      width       = 0
+      height      = 0
+      title       = "radio"
+      items        = []
+      choice_char = '#'.ord | RNDK::Color[:reverse]
+      default    = 0
+      highlight   = RNDK::Color[:reverse]
+      box         = true
+      shadow      = false
+
+      config.each do |key, val|
+        x           = val if key == :x
+        y           = val if key == :y
+        splace      = val if key == :splace
+        width       = val if key == :width
+        height      = val if key == :height
+        title       = val if key == :title
+        items       = val if key == :items
+        choice_char = val if key == :choice_char
+        default     = val if key == :default
+        highlight   = val if key == :highlight
+        box         = val if key == :box
+        shadow      = val if key == :shadow
+      end
+
+      items_size = items.size
+      parent_width = Ncurses.getmaxx(screen.window)
+      parent_height = Ncurses.getmaxy(screen.window)
       box_width = width
       box_height = height
       widest_item = 0
 
-      bindings = {
-        RNDK::BACKCHAR => Ncurses::KEY_PPAGE,
-        RNDK::FORCHAR  => Ncurses::KEY_NPAGE,
-        'g'           => Ncurses::KEY_HOME,
-        '1'           => Ncurses::KEY_HOME,
-        'G'           => Ncurses::KEY_END,
-        '<'           => Ncurses::KEY_HOME,
-        '>'           => Ncurses::KEY_END,
-      }
-
-      self.set_box(box)
+      self.set_box box
 
       # If the height is a negative value, height will be ROWS-height,
       # otherwise the height will be the given height.
-      box_height = RNDK.setWidgetDimension(parent_height, height, 0)
+      box_height = RNDK.set_widget_dimension(parent_height, height, 0)
 
       # If the width is a negative value, the width will be COLS-width,
       # otherwise the width will be the given width.
-      box_width = RNDK.setWidgetDimension(parent_width, width, 5)
+      box_width = RNDK.set_widget_dimension(parent_width, width, 5)
 
       box_width = self.set_title(title, box_width)
 
       # Set the box height.
       if @title_lines > box_height
-        box_height = @title_lines + [list_size, 8].min + 2 * @border_size
+        box_height = @title_lines + [items_size, 8].min + 2 * @border_size
       end
 
       # Adjust the box width if there is a scroll bar.
@@ -50,21 +73,21 @@ module RNDK
       @box_width = [box_width, parent_width].min
       @box_height = [box_height, parent_height].min
 
-      self.setViewSize(list_size)
+      self.set_view_size(items_size)
 
       # Each item in the needs to be converted to chtype array
-      widest_item = self.createList(list, list_size, @box_width)
+      widest_item = self.create_items(items, @box_width)
       if widest_item > 0
         self.updateViewWidth(widest_item)
-      elsif list_size > 0
+      elsif items_size > 0
         self.destroy
         return nil
       end
 
       # Rejustify the x and y positions if we need to.
-      xtmp = [xplace]
-      ytmp = [yplace]
-      RNDK.alignxy(rndkscreen.window, xtmp, ytmp, @box_width, @box_height)
+      xtmp = [x]
+      ytmp = [y]
+      RNDK.alignxy(screen.window, xtmp, ytmp, @box_width, @box_height)
       xpos = xtmp[0]
       ypos = ytmp[0]
 
@@ -82,18 +105,18 @@ module RNDK
 
       # Create the scrollbar window.
       if splace == RNDK::RIGHT
-        @scrollbar_win = Ncurses.subwin(@win, self.maxViewSize, 1,
+        @scrollbar_win = Ncurses.subwin(@win, self.max_view_size, 1,
             self.Screen_YPOS(ypos), xpos + @box_width - @border_size - 1)
       elsif splace == RNDK::LEFT
-        @scrollbar_win = Ncurses.subwin(@win, self.maxViewSize, 1,
+        @scrollbar_win = Ncurses.subwin(@win, self.max_view_size, 1,
             self.Screen_YPOS(ypos), self.Screen_XPOS(xpos))
       else
         @scrollbar_win = nil
       end
 
       # Set the rest of the variables
-      @screen = rndkscreen
-      @parent = rndkscreen.window
+      @screen = screen
+      @parent = screen.window
       @scrollbar_placement = splace
       @widest_item = widest_item
       @left_char = 0
@@ -102,12 +125,12 @@ module RNDK
       @choice_char = choice_char.ord
       @left_box_char = '['.ord
       @right_box_char = ']'.ord
-      @def_item = def_item
+      @default = default
       @input_window = @win
       @accepts_focus = true
       @shadow = shadow
 
-      self.setCurrentItem(0)
+      self.set_current_item(0)
 
       # Do we need to create the shadow?
       if shadow
@@ -116,11 +139,13 @@ module RNDK
       end
 
       # Setup the key bindings
-      bindings.each do |from, to|
-        self.bind(:RADIO, from, :getc, to)
-      end
+      self.bind_key('g') { self.scroll_begin }
+      self.bind_key('1') { self.scroll_begin }
+      self.bind_key('G') { self.scroll_end   }
+      self.bind_key('<') { self.scroll_begin }
+      self.bind_key('>') { self.scroll_end   }
 
-      rndkscreen.register(:RADIO, self)
+      screen.register(@widget_type, self)
     end
 
     # Put the cursor on the currently-selected item.
@@ -134,14 +159,14 @@ module RNDK
     end
 
     # This actually manages the radio widget.
-    def activate(actions)
-      # Draw the radio list.
-      self.draw(@box)
+    def activate(actions=[])
+      # Draw the radio items.
+      self.draw
 
       if actions.nil? || actions.size == 0
         while true
           self.fixCursorPosition
-          input = self.getch([])
+          input = self.getch
 
           # Inject the character into the widget.
           ret = self.inject(input)
@@ -164,47 +189,38 @@ module RNDK
     end
 
     # This injects a single character into the widget.
-    def inject(input)
-      pp_return = 1
-      ret = -1
+    def inject input
+      pp_return = true
+      ret = false
       complete = false
 
       # Set the exit type
       self.set_exit_type(0)
 
-      # Draw the widget list
-      self.drawList(@box)
+      # Draw the widget items
+      self.draw_items(@box)
 
-      # Check if there is a pre-process function to be called
-      unless @pre_process_func.nil?
-        # Call the pre-process function.
-        pp_return = @pre_process_func.call(:RADIO, self,
-            @pre_process_data, input)
-      end
+      # Check if there is a pre-process function to be called.
+      keep_going = self.run_signal_binding(:before_input, input)
+
+      if keep_going
 
-      # Should we continue?
-      if pp_return != 0
         # Check for a predefined key binding.
-        if self.checkBind(:RADIO, input)
-          complete = true
+        if self.is_bound? input
+          self.run_key_binding input
+          #complete = true
         else
           case input
-          when Ncurses::KEY_UP
-            self.KEY_UP
-          when Ncurses::KEY_DOWN
-            self.KEY_DOWN
-          when Ncurses::KEY_RIGHT
-            self.KEY_RIGHT
-          when Ncurses::KEY_LEFT
-            self.KEY_LEFT
-          when Ncurses::KEY_PPAGE
-            self.KEY_PPAGE
-          when Ncurses::KEY_NPAGE
-            self.KEY_NPAGE
-          when Ncurses::KEY_HOME
-            self.KEY_HOME
-          when Ncurses::KEY_END
-            self.KEY_END
+          when Ncurses::KEY_UP    then self.scroll_up
+          when Ncurses::KEY_DOWN  then self.scroll_down
+          when Ncurses::KEY_RIGHT then self.scroll_right
+          when Ncurses::KEY_LEFT  then self.scroll_left
+          when Ncurses::KEY_HOME  then self.scroll_begin
+          when Ncurses::KEY_END   then self.scroll_end
+          when Ncurses::KEY_PPAGE, RNDK::BACKCHAR
+            self.scroll_page_up
+          when Ncurses::KEY_NPAGE, RNDK::FORCHAR
+            self.scroll_page_down
           when '$'.ord
             @left_char = @max_left_char
           when '|'.ord
@@ -213,7 +229,7 @@ module RNDK
             @selected_item = @current_item
           when RNDK::KEY_ESC
             self.set_exit_type(input)
-            ret = -1
+            ret = false
             complete = true
           when Ncurses::ERR
             self.set_exit_type(input)
@@ -229,13 +245,11 @@ module RNDK
         end
 
         # Should we call a post-process?
-        if !complete && !(@post_process_func.nil?)
-          @post_process_func.call(:RADIO, self, @post_process_data, input)
-        end
+        self.run_signal_binding(:after_input) if not complete
       end
 
-      if !complete
-        self.drawList(@box)
+      if not complete
+        self.draw_items(@box)
         self.set_exit_type(0)
       end
 
@@ -245,34 +259,32 @@ module RNDK
     end
 
     # This moves the radio field to the given location.
-    def move(xplace, yplace, relative, refresh_flag)
+    def move(x, y, relative, refresh_flag)
       windows = [@win, @scrollbar_win, @shadow_win]
-      self.move_specific(xplace, yplace, relative, refresh_flag,
+      self.move_specific(x, y, relative, refresh_flag,
           windows, subwidgets)
     end
 
     # This function draws the radio widget.
-    def draw(box)
+    def draw
       # Do we need to draw in the shadow?
-      if !(@shadow_win.nil?)
-        Draw.drawShadow(@shadow_win)
-      end
+      Draw.drawShadow(@shadow_win) unless @shadow_win.nil?
 
-      self.drawTitle(@win)
+      self.draw_title @win
 
-      # Draw in the radio list.
-      self.drawList(@box)
+      # Draw in the radio items.
+      self.draw_items @box
     end
 
-    # This redraws the radio list.
-    def drawList(box)
+    # This redraws the radio items.
+    def draw_items(box)
       scrollbar_adj = if @scrollbar_placement == RNDK::LEFT then 1 else 0 end
       screen_pos = 0
 
-      # Draw the list
+      # Draw the items
       (0...@view_size).each do |j|
         k = j + @current_top
-        if k < @list_size
+        if k < @items_size
           xpos = self.Screen_XPOS(0)
           ypos = self.Screen_YPOS(j)
 
@@ -301,7 +313,7 @@ module RNDK
       # Highlight the current item
       if @has_focus
         k = @current_item
-        if k < @list_size
+        if k < @items_size
           screen_pos = self.ScreenPOS(k, scrollbar_adj)
           ypos = self.Screen_YPOS(@current_high)
 
@@ -326,7 +338,7 @@ module RNDK
         Ncurses.mvwvline(@scrollbar_win,
                          @toggle_pos,
                          0,
-                         ' '.ord | Ncurses::A_REVERSE,
+                         ' '.ord | RNDK::Color[:reverse],
                          @toggle_size)
       end
 
@@ -339,7 +351,7 @@ module RNDK
     end
 
     # This sets the background attribute of the widget.
-    def set_bg_attrib(attrib)
+    def set_bg_color(attrib)
       Ncurses.wbkgd(@win, attrib)
       Ncurses.wbkgd(@scrollbar_win, attrib) unless @scrollbar_win.nil?
     end
@@ -350,7 +362,7 @@ module RNDK
 
     # This function destroys the radio widget.
     def destroy
-      self.cleanTitle
+      self.clean_title
       self.destroyInfo
 
       # Clean up the windows.
@@ -359,33 +371,31 @@ module RNDK
       RNDK.window_delete(@win)
 
       # Clean up the key bindings.
-      self.clean_bindings(:RADIO)
+      self.clean_bindings
 
-      # Unregister this object.
-      RNDK::Screen.unregister(:RADIO, self)
+      # Unregister this widget.
+      @screen.unregister self
     end
 
     # This function erases the radio widget
     def erase
-      if self.valid_widget?
+      if self.valid?
         RNDK.window_erase(@win)
         RNDK.window_erase(@shadow_win)
       end
     end
 
-    # This sets various attributes of the radio list.
+    # This sets various attributes of the radio items.
     def set(highlight, choice_char, box)
       self.set_highlight(highlight)
       self.setChoiceCHaracter(choice_char)
       self.set_box(box)
     end
 
-    # This sets the radio list items.
-    def setItems(list, list_size)
-      widest_item = self.createList(list, list_size, @box_width)
-      if widest_item <= 0
-        return
-      end
+    # This sets the radio items items.
+    def set_items(items)
+      widest_item = self.create_items(items, @box_width)
+      return if widest_item <= 0
 
       # Clean up the display.
       (0...@view_size).each do |j|
@@ -393,23 +403,23 @@ module RNDK
             RNDK::HORIZONTAL, 0, @box_width - @border_size)
       end
 
-      self.setViewSize(list_size)
+      self.set_view_size(items_size)
 
-      self.setCurrentItem(0)
+      self.set_current_item(0)
       @left_char = 0
       @selected_item = 0
 
       self.updateViewWidth(widest_item)
     end
 
-    def getItems(list)
-      (0...@list_size).each do |j|
-        list << RNDK.chtype2Char(@item[j])
+    def getItems(items)
+      (0...@items_size).each do |j|
+        items << RNDK.chtype2Char(@item[j])
       end
-      return @list_size
+      return @items_size
     end
 
-    # This sets the highlight bar of the radio list.
+    # This sets the highlight bar of the radio items.
     def set_highlight(highlight)
       @highlight = highlight
     end
@@ -418,7 +428,7 @@ module RNDK
       return @highlight
     end
 
-    # This sets the character to use when selecting na item in the list.
+    # This sets the character to use when selecting na item in the items.
     def setChoiceCharacter(character)
       @choice_char = character
     end
@@ -428,7 +438,7 @@ module RNDK
     end
 
     # This sets the character to use to drw the left side of the choice box
-    # on the list
+    # on the items
     def setLeftBrace(character)
       @left_box_char = character
     end
@@ -438,7 +448,7 @@ module RNDK
     end
 
     # This sets the character to use to draw the right side of the choice box
-    # on the list
+    # on the items
     def setRightBrace(character)
       @right_box_char = character
     end
@@ -448,8 +458,8 @@ module RNDK
     end
 
     # This sets the current highlighted item of the widget
-    def setCurrentItem(item)
-      self.setPosition(item)
+    def set_current_item(item)
+      self.set_position(item)
       @selected_item = item
     end
 
@@ -467,32 +477,32 @@ module RNDK
     end
 
     def focus
-      self.drawList(@box)
+      self.draw_items(@box)
     end
 
     def unfocus
-      self.drawList(@box)
+      self.draw_items(@box)
     end
 
-    def createList(list, list_size, box_width)
+    def create_items(items, box_width)
       status = false
       widest_item = 0
 
-      if list_size >= 0
-        new_list = []
+      if items.size >= 0
+        new_items = []
         new_len = []
         new_pos = []
 
         # Each item in the needs to be converted to chtype array
         status = true
         box_width -= 2 + @border_size
-        (0...list_size).each do |j|
+        (0...items.size).each do |j|
           lentmp = []
           postmp = []
-          new_list << RNDK.char2Chtype(list[j], lentmp, postmp)
+          new_items << RNDK.char2Chtype(items[j], lentmp, postmp)
           new_len << lentmp[0]
           new_pos << postmp[0]
-          if new_list[j].nil? || new_list[j].size == 0
+          if new_items[j].nil? || new_items[j].size == 0
             status = false
             break
           end
@@ -501,11 +511,12 @@ module RNDK
         end
         if status
           self.destroyInfo
-          @item = new_list
+          @item = new_items
           @item_len = new_len
           @item_pos = new_pos
         end
       end
+      @items_size = items.size
 
       return (if status then widest_item else 0 end)
     end
@@ -531,8 +542,7 @@ module RNDK
       @item_pos[n] - @left_char + scrollbar_adj + @border_size
     end
 
-    def object_type
-      :RADIO
-    end
+
+
   end
 end