Changeset 213

Timestamp:

09/28/2007 18:13:45 (11 months ago)

Author:

why

Message:

* shoes/ruby.c: adding a span inline, which does just like HTML, for applying adhoc styles.
* samples/: updating some samples with the new methods, still needs lots of work obviously.

Location:

trunk

Files:

• samples/anim.rb (modified) (1 diff)
• samples/book.rb (modified) (2 diffs)
• samples/calc.rb (modified) (2 diffs)
• samples/dialogs.rb (modified) (1 diff)
• samples/edit.rb (modified) (2 diffs)
• samples/form.rb (modified) (1 diff)
• shoes/canvas.c (modified) (1 diff)
• shoes/canvas.h (modified) (1 diff)
• shoes/ruby.c (modified) (4 diffs)
• shoes/ruby.h (modified) (2 diffs)

trunk/samples/anim.rb

@@ -1 +1 @@
 Shoes.app do
   stack :top => 0.5, :left => 0.5 do
-    text "Counting up:"
-    l = text "0"
+    para "Counting up:"
+    l = para "0"
     animate(24) do |i|
       f = ['Arial 14px', 'Serif 34px', 'Monospace 18px', 'Arial 48px'][rand(3)]
-      l.replace "<span font_desc='#{f}'>#{i}</span>"
+      l.replace "#{i}", :font => f
     end
     motion do |x, y|

trunk/samples/book.rb

@@ -10 +10 @@
 
   def table_of_contents
-    toc = "<span font_desc='Arial 11px'>"
+    toc = []
     INCIDENTS.each_with_index do |(title, story), i|
-      toc += "(#{i + 1}) <a href='/incidents/#{i}'>#{title}</a> "
+      toc.push "(#{i + 1}) ",
+        link(title, :url => "/incidents/#{i}"),
+        " / "
     end
-    toc + "</span>"
+    toc.pop
+    span *toc
   end
 
@@ -20 +23 @@
     num = num.to_i
     flow :margin => 10, :margin_left => 190, :margin_top => 20 do
-      text "<span font_desc='Arial 46px'>Incident</span>\n" +
-        "<b>No. #{num + 1}: #{INCIDENTS[num][0]}</b>"
+      banner "Incident\n"
+      para strong("No. #{num + 1}: #{INCIDENTS[num][0]}")
     end
     flow :width => 180, :margin_left => 10, :margin_top => 10 do
-      text table_of_contents
+      para table_of_contents, :font => "Arial 12px"
     end
     flow :width => -190, :margin => 10 do
-      text INCIDENTS[num][1]
+      para INCIDENTS[num][1]
     end
   end

trunk/samples/calc.rb

@@ -46 +46 @@
 
     stack :margin => 8 do
-      number_field = text "<b>#{number}</b>"
+      number_field = para strong(number)
     end
 
@@ -63 +63 @@
           
           number.send(method)
-          number_field.replace "<b>#{number} </b>"
+          number_field.replace strong(number)
         end
       end

trunk/samples/dialogs.rb

@@ -20 +20 @@
   end
 
-  @answer = text "Answers appear here"
+  @answer = para "Answers appear here"
 end

trunk/samples/edit.rb

@@ -3 +3 @@
   background rgb(77, 77, 77)
   stack :margin => 10 do
-    text "<span color='white'><span color='red' background='white'>TEXT EDITOR</span> * USE ALT-Q TO QUIT</span>"
+    para span("TEXT EDITOR", :stroke => red, :fill => white), " * USE ALT-Q TO QUIT", :stroke => white
   end
   stack :margin => 10 do
-    t = text ""
+    t = para "", :font => "Monospace 12px", :stroke => white
     t.cursor = -1
   end
@@ -24 +24 @@
       str += self.clipboard
     end
-    s = Shoes.escape(str).gsub(/^def /, "<span color='#FFDDAA'>def</span> ")
-    t.replace "<span font_desc='Monospace 12' color='white'>#{s}</span>"
+    t.replace str
   end
 end

trunk/samples/form.rb

@@ -9 +9 @@
   stack :margin => 40 do
     stack :margin => 10 do
-      text "Name"
+      para "Name"
       @name = list_box :items => ["Yes, please!", "NO.  No thankyou."]
     end
     stack :margin => 10 do
-      text "Address"
+      para "Address"
       @address = edit_line
     end
     stack :margin => 10 do
-      text "Phone"
+      para "Phone"
       @phone = edit_line
     end

trunk/shoes/canvas.c

@@ -579 +579 @@
 MARKUP_DEF(ins, INLINE, cIns);
 MARKUP_DEF(link, INLINE, cLinkText);
+MARKUP_DEF(span, INLINE, cSpan);
 MARKUP_DEF(strong, INLINE, cStrong);
 

trunk/shoes/canvas.h

@@ -206 +206 @@
 VALUE shoes_canvas_ins(int argc, VALUE *argv, VALUE self);
 VALUE shoes_canvas_link(int argc, VALUE *argv, VALUE self);
+VALUE shoes_canvas_span(int argc, VALUE *argv, VALUE self);
 VALUE shoes_canvas_strong(int argc, VALUE *argv, VALUE self);
 VALUE shoes_canvas_background(int, VALUE *, VALUE);

trunk/shoes/ruby.c

@@ -10 +10 @@
 #include <math.h>
 
-VALUE cShoes, cApp, cCanvas, cFlow, cStack, cMask, cPath, cImage, cAnim, cPattern, cBorder, cBackground, cTextBlock, cPara, cBanner, cTitle, cSubtitle, cTagline, cCaption, cInscription, cTextClass, cStrong, cCode, cEm, cIns, cLinkText, cNative, cButton, cEditLine, cEditBox, cListBox, cProgress, cColor, cColors, cLink;
+VALUE cShoes, cApp, cCanvas, cFlow, cStack, cMask, cPath, cImage, cAnim, cPattern, cBorder, cBackground, cTextBlock, cPara, cBanner, cTitle, cSubtitle, cTagline, cCaption, cInscription, cTextClass, cSpan, cStrong, cCode, cEm, cIns, cLinkText, cNative, cButton, cEditLine, cEditBox, cListBox, cProgress, cColor, cColors, cLink;
 VALUE reHEX_SOURCE, reHEX3_SOURCE, reRGB_SOURCE, reRGBA_SOURCE, reGRAY_SOURCE, reGRAYA_SOURCE;
 ID s_aref, s_perc, s_bind, s_new, s_run, s_to_pattern, s_to_i, s_to_s, s_angle, s_arrow, s_begin, s_call, s_center, s_change, s_click, s_corner, s_downcase, s_draw, s_end, s_font, s_hand, s_hidden, s_href, s_insert, s_items, s_scroll, s_match, s_text, s_title, s_top, s_right, s_bottom, s_left, s_height, s_resizable, s_remove, s_strokewidth, s_width, s_margin, s_margin_left, s_margin_right, s_margin_top, s_margin_bottom, s_radius;
@@ -1353 +1353 @@
 shoes_textblock_replace(int argc, VALUE *argv, VALUE self)
 {
-  VALUE texts;
+  long i;
+  VALUE texts, attr;
   shoes_textblock *self_t;
   Data_Get_Struct(self, shoes_textblock, self_t);
-  rb_scan_args(argc, argv, "*", &texts);
+
+  attr = Qnil;
+  texts = rb_ary_new();
+  for (i = 0; i < argc; i++)
+  {
+    if (rb_obj_is_kind_of(argv[i], rb_cHash))
+      attr = argv[i];
+    else
+      rb_ary_push(texts, argv[i]);
+  }
+
   self_t->texts = texts;
+  if (!NIL_P(attr)) self_t->attr = attr;
+
   shoes_canvas_repaint_all(self_t->parent);
   return self;
@@ -1610 +1623 @@
     else
     {
-      StringValue(v);
+      v = rb_funcall(v, s_to_s, 0);
       k->len += RSTRING_LEN(v); 
       g_string_append_len(k->text, RSTRING_PTR(v), RSTRING_LEN(v));
@@ -2629 +2642 @@
   cLinkText  = rb_define_class_under(cShoes, "LinkText", cTextClass);
   cIns       = rb_define_class_under(cShoes, "Ins", cTextClass);
+  cSpan      = rb_define_class_under(cShoes, "Span", cTextClass);
   cStrong    = rb_define_class_under(cShoes, "Strong", cTextClass);
 

trunk/shoes/ruby.h

@@ -23 +23 @@
 #endif
 
-extern VALUE cShoes, cApp, cCanvas, cFlow, cStack, cMask, cNative, cPath, cImage, cAnim, cPattern, cBorder, cBackground, cPara, cBanner, cTitle, cSubtitle, cTagline, cCaption, cInscription, cLinkText, cTextClass, cStrong, cCode, cEm, cIns, cButton, cEditLine, cEditBox, cListBox, cProgress, cColor, cColors, cLink;
+extern VALUE cShoes, cApp, cCanvas, cFlow, cStack, cMask, cNative, cPath, cImage, cAnim, cPattern, cBorder, cBackground, cPara, cBanner, cTitle, cSubtitle, cTagline, cCaption, cInscription, cLinkText, cTextClass, cSpan, cStrong, cCode, cEm, cIns, cButton, cEditLine, cEditBox, cListBox, cProgress, cColor, cColors, cLink;
 extern VALUE reHEX_SOURCE, reHEX3_SOURCE, reRGB_SOURCE, reRGBA_SOURCE, reGRAY_SOURCE, reGRAYA_SOURCE;
 extern ID s_aref, s_bind, s_new, s_run, s_to_pattern, s_to_i, s_to_s, s_angle, s_arrow, s_begin, s_call, s_center, s_change, s_click, s_corner, s_downcase, s_draw, s_end, s_font, s_hand, s_hidden, s_href, s_insert, s_items, s_match, s_scroll, s_text, s_title, s_top, s_right, s_bottom, s_left, s_height, s_remove, s_resizable, s_strokewidth, s_width, s_margin, s_margin_left, s_margin_right, s_margin_top, s_margin_bottom, s_radius;
@@ -115 +115 @@
   f("ins", ins, -1); \
   f("link", link, -1); \
+  f("span", span, -1); \
   f("strong", strong, -1); \
   f("background", background, -1); \