← Back to branch summary

~glitter-team/glitter/trunk

« back to all changes in this revision

Viewing changes to glitter/scroll_area.py

  • Committer: Jan Jokela
  • Date: 2009-06-06 13:03:00 UTC
  • mto: This revision was merged to the branch mainline in revision 30.
  • Revision ID: jan@jan-laptop-20090606130300-38nir7ftngwry3ud
(glitter/scroll_area.py) Removed debug messages

Show diffs side-by-side

added added

removed removed

Lines of Context:
glitter/scroll_area.py
137
137
        elif target_y < self.get_heightu() - self._scroll_image.get_heightu():
138
138
            target_y = -(self._scroll_image.get_heightu() - self.get_heightu())     
139
139
        
140
 
        if self._scroll_image.get_xu() == 0 or self._scroll_image.get_xu() == self.get_widthu() - self._scroll_image.get_widthu():
 
140
        # Neutralize horizontal and/or vertical factors when the scroll area
 
141
        # hits bounds
 
142
        right_bound = self.get_widthu() - self._scroll_image.get_widthu()
 
143
        if self._scroll_image.get_xu() == 0 or \
 
144
          self._scroll_image.get_xu() == right_bound:
141
145
            self._horiz_factor = 0.0
142
 
        if self._scroll_image.get_yu() == 0 or self._scroll_image.get_yu() == self.get_heightu() - self._scroll_image.get_heightu():
 
146
        right_bound = self.get_heightu() - self._scroll_image.get_heightu()
 
147
        if self._scroll_image.get_yu() == 0 or \
 
148
          self._scroll_image.get_yu() == right_bound:
143
149
            self._vert_factor = 0.0            
144
150
        
145
151
        # Kick-start scroll animations
160
166
        """ Handles scroll event """
161
167
 
162
168
        if event.direction == clutter.SCROLL_UP:
163
 
            print 'scroll UP'
164
169
            self.scroll(vert_factor=0.1)
165
170
        elif event.direction == clutter.SCROLL_DOWN:
166
 
            print 'scroll DOWN'
167
171
            self.scroll(vert_factor=-0.1)
168
172
        elif event.direction == clutter.SCROLL_LEFT:
169
 
            print 'scroll LEFT'
170
173
            self.scroll(0.1)
171
174
        elif event.direction == clutter.SCROLL_RIGHT:
172
 
            print 'scroll RIGHT'
173
175
            self.scroll(-0.1)
174
176
            
175
177
    def do_key_press_event(self, widget, event):
176
178
        """ Handles key press event """
177
179
 
178
180
        if event.keyval == clutter.keysyms.Up:
179
 
            print 'scroll UP'
180
181
            self.scroll(vert_factor=0.1)
181
182
        elif event.keyval == clutter.keysyms.Down:
182
 
            print 'scroll DOWN'
183
183
            self.scroll(vert_factor=-0.1)
184
184
        elif event.keyval == clutter.keysyms.Left:
185
 
            print 'scroll LEFT'
186
185
            self.scroll(0.1)
187
186
        elif event.keyval == clutter.keysyms.Right:
188
 
            print 'scroll RIGHT'
189
187
            self.scroll(-0.1)
190
188