Changeset 28996

Timestamp:

01/25/09 12:16:07 (4 years ago)

Author:

isaisstillalive

Message:

• 段落フォーマットと区別するため、Rich::FormatをRich::Format::Charに変更。
  

Location:

lang/ruby/ruwin

Files:

• lib/ruwin/edit_field/rich.rb (modified) (3 diffs)
• test/ruwin/edit_field/test_rich.rb (modified) (2 diffs)

lang/ruby/ruwin/lib/ruwin/edit_field/rich.rb

@@ -7 +7 @@
         def initialize *args
           super
-          @format = Format.new self, SCF_SELECTION
+          @format = Format::Char.new self, SCF_SELECTION
         end
         
@@ -17 +17 @@
       end
       
-      class Format
-        include Ruwin
-        include Const::EditField
-        
-        def initialize control, extent_flag
-          @control = control
-          @extent_flag = extent_flag
-        end
-        
-        {
-          :bold       => %w{CFM_BOLD      CFE_BOLD},
-          :italic     => %w{CFM_ITALIC    CFE_ITALIC},
-          :underline  => %w{CFM_UNDERLINE CFE_UNDERLINE},
-          :strikeout  => %w{CFM_STRIKEOUT CFE_STRIKEOUT},
-          :protected  => %w{CFM_PROTECTED CFE_PROTECTED},
-        }.each do |option, (mask, effect)|
-          class_eval <<-"END"
-            def #{option}= enable
-              set_char_format(#{mask}, :effects => (enable ? #{effect} : 0))
-            end
-            
-            def #{option}
-              get_char_format(#{mask})[2]&#{effect} == #{effect}
-            end
-          END
-        end
-        
-        {
-          :height     => %w{CFM_SIZE    twip},
-          :offset     => %w{CFM_OFFSET  twip},
-          :color      => %w{CFM_COLOR   color},
-        }.each do |option, (mask, variable)|
-          class_eval <<-"END"
-            def #{option}= #{variable}
-              set_char_format(#{mask}, :#{option} => #{variable})
-            end
-          END
-        end
-        
-        def height
-          SIGNEDLONG(get_char_format(CFM_SIZE)[3])
-        end
-        
-        def offset
-          SIGNEDLONG(get_char_format(CFM_OFFSET)[4])
-        end
-        
-        def color
-          get_char_format(CFM_OFFSET)[5]
-        end
-        
-        
-        private
-        CHARFORMAT = "LLLLLLCCU"
-        
-        def set_char_format mask, options
-          @control.sendMessage EM_SETCHARFORMAT, @extent_flag, char_format(mask, options)
-        end
-        
-        def get_char_format mask
-          charformat = char_format mask
-          @control.sendMessage EM_GETCHARFORMAT, @extent_flag, charformat
-          charformat.unpack CHARFORMAT
-        end
-        
-        def char_format mask, options = {}
-          [
-            60,
-            mask,
-            options[:effects] || 0,
-            options[:height]  || 0,
-            options[:offset]  || 0,
-            options[:color]   || 0,
-            0,
-            0,
-            0,
-          ].pack CHARFORMAT
+      module Format
+        class Char
+          include Ruwin
+          include Const::EditField
+          
+          def initialize control, extent_flag
+            @control = control
+            @extent_flag = extent_flag
+          end
+          
+          {
+            :bold       => %w{CFM_BOLD      CFE_BOLD},
+            :italic     => %w{CFM_ITALIC    CFE_ITALIC},
+            :underline  => %w{CFM_UNDERLINE CFE_UNDERLINE},
+            :strikeout  => %w{CFM_STRIKEOUT CFE_STRIKEOUT},
+            :protected  => %w{CFM_PROTECTED CFE_PROTECTED},
+          }.each do |option, (mask, effect)|
+            class_eval <<-"END"
+              def #{option}= enable
+                set_char_format(#{mask}, :effects => (enable ? #{effect} : 0))
+              end
+              
+              def #{option}
+                get_char_format(#{mask})[2]&#{effect} == #{effect}
+              end
+            END
+          end
+          
+          {
+            :height     => %w{CFM_SIZE    twip},
+            :offset     => %w{CFM_OFFSET  twip},
+            :color      => %w{CFM_COLOR   color},
+          }.each do |option, (mask, variable)|
+            class_eval <<-"END"
+              def #{option}= #{variable}
+                set_char_format(#{mask}, :#{option} => #{variable})
+              end
+            END
+          end
+          
+          def height
+            SIGNEDLONG(get_char_format(CFM_SIZE)[3])
+          end
+          
+          def offset
+            SIGNEDLONG(get_char_format(CFM_OFFSET)[4])
+          end
+          
+          def color
+            get_char_format(CFM_OFFSET)[5]
+          end
+          
+          
+          private
+          CHARFORMAT = "LLLLLLCCU"
+          
+          def set_char_format mask, options
+            @control.sendMessage EM_SETCHARFORMAT, @extent_flag, char_format(mask, options)
+          end
+          
+          def get_char_format mask
+            charformat = char_format mask
+            @control.sendMessage EM_GETCHARFORMAT, @extent_flag, charformat
+            charformat.unpack CHARFORMAT
+          end
+          
+          def char_format mask, options = {}
+            [
+              60,
+              mask,
+              options[:effects] || 0,
+              options[:height]  || 0,
+              options[:offset]  || 0,
+              options[:color]   || 0,
+              0,
+              0,
+              0,
+            ].pack CHARFORMAT
+          end
         end
       end
@@ -114 +116 @@
         self.background_color = @proparty[:background_color] if @proparty[:background_color]
         
-        @default = Format.new self, SCF_DEFAULT
+        @default = Format::Char.new self, SCF_DEFAULT
         @default.color = @proparty[:color] if @proparty[:color]
       end

lang/ruby/ruwin/test/ruwin/edit_field/test_rich.rb

@@ -26 +26 @@
   
   def test_default_format
-    assert_kind_of Ruwin::EditField::Rich::Format, @control.default
+    assert_kind_of Ruwin::EditField::Rich::Format::Char, @control.default
     assert_same @control, @control.default.instance_variable_get(:@control)
   end
@@ -122 +122 @@
 end
 
-class TestRuwinEditFieldRichFormatDefault < Test::Unit::TestCase
+class TestRuwinEditFieldRichCharFormat < Test::Unit::TestCase
   include Ruwin::Const::EditField