Changeset 491

Timestamp:

03/17/2008 09:30:56 (5 months ago)

Author:

why

Message:

• shoes/ruby.c: ever since i started computing the layout before painting it, the CHANGED_COORDS() test no longer applies.
  

Files:

• trunk/shoes/ruby.c (modified) (5 diffs)

trunk/shoes/ruby.c

@@ -528 +528 @@
   }
 
-#define CHANGED_COORDS() self_t->place.x != place.x || self_t->place.y != place.y || self_t->place.w != place.w || self_t->place.h - HEIGHT_PAD != place.h
+#define CHANGED_COORDS() self_t->place.ix != place.ix || self_t->place.iy != place.iy || self_t->place.iw != place.iw || self_t->place.ih - HEIGHT_PAD != place.ih
 #define PLACE_COORDS() place.h -= HEIGHT_PAD; place.ih -= HEIGHT_PAD; self_t->place = place
 
@@ -539 +539 @@
 
 #define PLACE_CONTROL() \
+  PLACE_COORDS(); \
   gtk_widget_set_size_request(self_t->ref, place.iw, place.ih); \
   gtk_layout_put(GTK_LAYOUT(canvas->slot.canvas), self_t->ref, place.ix, place.iy); \
   gtk_widget_show_all(self_t->ref); \
-  PLACE_COORDS();
 
 #define REPAINT_CONTROL() \
-  if (CHANGED_COORDS()) { \
-    gtk_layout_move(GTK_LAYOUT(canvas->slot.canvas), self_t->ref, place.ix, place.iy); \
-    gtk_widget_set_size_request(self_t->ref, place.iw, place.ih); \
-    PLACE_COORDS(); \
-  } \
+  PLACE_COORDS(); \
+  gtk_layout_move(GTK_LAYOUT(canvas->slot.canvas), self_t->ref, place.ix, place.iy); \
+  gtk_widget_set_size_request(self_t->ref, place.iw, place.ih); \
   if (canvas->slot.expose != NULL) \
   { \
@@ -568 +566 @@
 #define PLACE_CONTROL() \
   HIRect hr; \
+  PLACE_COORDS(); \
   hr.origin.x = place.ix; hr.origin.y = place.iy; \
-  hr.size.width = place.iw; hr.size.height = place.ih - HEIGHT_PAD; \
+  hr.size.width = place.iw; hr.size.height = place.ih; \
   HIViewAddSubview(canvas->slot.view, self_t->ref); \
   SetControlCommandID(self_t->ref, SHOES_CONTROL1 + RARRAY_LEN(canvas->slot.controls)); \
@@ -576 +575 @@
   HIViewSetVisible(self_t->ref, true); \
   rb_ary_push(canvas->slot.controls, self); \
-  PLACE_COORDS();
 
 #define REPAINT_CONTROL() \
-  if (CHANGED_COORDS()) { \
-    HIRect hr; \
-    hr.origin.x = place.ix; hr.origin.y = place.iy; \
-    hr.size.width = place.iw; hr.size.height = place.ih - HEIGHT_PAD; \
-    HIViewSetFrame(self_t->ref, &hr); \
-    PLACE_COORDS(); \
-  }
+  HIRect hr; \
+  PLACE_COORDS(); \
+  hr.origin.x = place.ix; hr.origin.y = place.iy; \
+  hr.size.width = place.iw; hr.size.height = place.ih; \
+  HIViewSetFrame(self_t->ref, &hr);
 
 static CFStringRef
@@ -627 +623 @@
 #define REPAINT_CONTROL() \
   place.iy -= canvas->slot.scrolly; \
-  if (CHANGED_COORDS()) { \
-    PLACE_CONTROL(); \
-  } \
+  PLACE_CONTROL(); \
   place.iy += canvas->slot.scrolly