Ticket #2184: logging.patch

src/sugar3/graphics/palettewindow.py

@@ -351 +351 @@
 
         return rect
 
-    def do_draw(self, cr):
-        # Fall trough to the container expose handler.
-        # (Leaving out the window expose handler which redraws everything)
-        Gtk.Window.do_draw(self, cr)
-
-        if self._invoker is not None and self._invoker.has_rectangle_gap():
-            invoker = self._invoker.get_rect()
-            palette = self.get_rect()
-            gap = _calculate_gap(palette, invoker)
-        else:
-            gap = False
-
-        allocation = self.get_allocation()
-        context = self.get_style_context()
-        context.add_class('toolitem')
-        if gap:
-            Gtk.render_frame_gap(context, cr, 0, 0, allocation.width, allocation.height,
-                                 gap[0], gap[1], gap[1] + gap[2])
-        else:
-            Gtk.render_frame(context, cr, 0, 0, allocation.width, allocation.height)
-        return False
+    # def do_draw(self, cr):
+    #     # Fall trough to the container expose handler.
+    #     # (Leaving out the window expose handler which redraws everything)
+    #     Gtk.Window.do_draw(self, cr)
+
+    #     if self._invoker is not None and self._invoker.has_rectangle_gap():
+    #         invoker = self._invoker.get_rect()
+    #         palette = self.get_rect()
+    #         gap = _calculate_gap(palette, invoker)
+    #     else:
+    #         gap = False
+
+    #     allocation = self.get_allocation()
+    #     context = self.get_style_context()
+    #     context.add_class('toolitem')
+    #     if gap:
+    #         Gtk.render_frame_gap(context, cr, 0, 0, allocation.width, allocation.height,
+    #                              gap[0], gap[1], gap[1] + gap[2])
+    #     else:
+    #         Gtk.render_frame(context, cr, 0, 0, allocation.width, allocation.height)
+    #     return False
 
     def __enter_notify_event_cb(self, widget, event):
         if event.mode == Gdk.CrossingMode.NORMAL and \
@@ -387 +387 @@
             self.emit('leave-notify')
 
     def popup(self, invoker):
+        logging.debug("MANUQ _PaletteWindowWidget popup %r", (self.get_visible(),))
         if self.get_visible():
             return
         self.connect('enter-notify-event', self.__enter_notify_event_cb)
         self.connect('leave-notify-event', self.__leave_notify_event_cb)
         self.show()
+        logging.debug("MANUQ _PaletteWindowWidget popup2 %r", (self.get_visible(),))
 
     def popdown(self):
+        logging.debug("MANUQ _PaletteWindowWidget popdown %r", (self.get_visible(),))
         if not self.get_visible():
             return
         self.disconnect_by_func(self.__enter_notify_event_cb)
@@ -508 +511 @@
         self._mouse_detector = MouseSpeedDetector(200, 5)
 
     def _setup_widget(self):
+        logging.debug("MANUQ PaletteWindow _setup_widget %r", (self._widget,))
         self._widget.connect('show', self.__show_cb)
         self._widget.connect('hide', self.__hide_cb)
         self._widget.connect('destroy', self.__destroy_cb)
@@ -670 +674 @@
             self.on_invoker_leave()
 
     def _invoker_right_click_cb(self, invoker):
+        logging.debug("MANUQ PaletteWindow _invoker_right_click_cb")
         self.popup(immediate=True, state=self.SECONDARY)
 
     def _invoker_toggle_state_cb(self, invoker):
+        logging.debug("MANUQ PaletteWindow _invoker_toggle_state_cb %r",
+                      (self.is_up(), self._palette_state  == self.SECONDARY))
         if self.is_up() and self._palette_state == self.SECONDARY:
             self.popdown(immediate=True)
         else:
@@ -687 +694 @@
             self.on_leave()
 
     def __show_cb(self, widget):
+        logging.debug("MANUQ PaletteWindow __show_cb %r", (widget,))
+        widget.show_all()
         if self._invoker is not None:
             self._invoker.notify_popup()
 
@@ -694 +703 @@
         self.emit('popup')
 
     def __hide_cb(self, widget):
+        logging.debug("MANUQ PaletteWindow __hide_cb %r", (widget,))
         if self._invoker:
             self._invoker.notify_popdown()
 
@@ -1174 +1184 @@
                 self.parent.set_expanded(True)
 
         if self.props.toggle_palette:
+            logging.debug("MANUQ WidgetInvoker __click_event_cb")
             self.notify_toggle_state()
 
     def __button_release_event_cb(self, widget, event):
@@ -1184 +1195 @@
                     self.parent.set_expanded(True)
 
             if self.props.toggle_palette:
+                logging.debug("MANUQ WidgetInvoker __button_release_event_cb")
                 self.notify_toggle_state()
         elif event.button == 3:
             self.notify_right_click()
@@ -1199 +1211 @@
         return self._widget.get_toplevel()
 
     def notify_popup(self):
+        logging.debug("MANUQ WidgetInvoker notify_popup %r", (self._widget,))
         Invoker.notify_popup(self)
         self._widget.queue_draw()
 
     def notify_popdown(self):
+        logging.debug("MANUQ WidgetInvoker notify_popdown %r", (self._widget,))
         self.locked = False
         Invoker.notify_popdown(self)
         self._widget.queue_draw()
@@ -1294 +1308 @@
             return True
         if event.button == 1:
             if self.props.toggle_palette:
+                logging.debug("MANUQ CursorInvoker __button_release_event_cb")
                 self.notify_toggle_state()
         if event.button == 3:
             self.notify_right_click()