gtk3 3.0.8-x86-mingw32 → 3.0.9-x86-mingw32

data/sample/gtk-demo/reset.css

@@ -7,62 +7,5 @@
  */
 
 * {
-  color: inherit;
-  font-size: inherit;
-  background-color: initial;
-  font-family: inherit;
-  font-style: inherit;
-  font-variant: inherit;
-  font-weight: inherit;
-  text-shadow: inherit;
-  icon-shadow: inherit;
-  box-shadow: initial;
-  margin-top: initial;
-  margin-left: initial;
-  margin-bottom: initial;
-  margin-right: initial;
-  padding-top: initial;
-  padding-left: initial;
-  padding-bottom: initial;
-  padding-right: initial;
-  border-top-style: initial;
-  border-top-width: initial;
-  border-left-style: initial;
-  border-left-width: initial;
-  border-bottom-style: initial;
-  border-bottom-width: initial;
-  border-right-style: initial;
-  border-right-width: initial;
-  border-top-left-radius: initial;
-  border-top-right-radius: initial;
-  border-bottom-right-radius: initial;
-  border-bottom-left-radius: initial;
-  outline-style: initial;
-  outline-width: initial;
-  outline-offset: initial;
-  background-clip: initial;
-  background-origin: initial;
-  background-size: initial;
-  background-position: initial;
-  border-top-color: initial;
-  border-right-color: initial;
-  border-bottom-color: initial;
-  border-left-color: initial;
-  outline-color:  initial;
-  background-repeat: initial;
-  background-image: initial;
-  border-image-source: initial;
-  border-image-repeat: initial;
-  border-image-slice: initial;
-  border-image-width: initial;
-  transition-property: initial;
-  transition-duration: initial;
-  transition-timing-function: initial;
-  transition-delay: initial;
-  engine: initial;
-  gtk-key-bindings: initial;
-
-  -GtkWidget-focus-line-width: 0;
-  -GtkWidget-focus-padding: 0;
-  -GtkNotebook-initial-gap: 0;
+  all: unset;
 }

data/sample/gtk-demo/rotated_text.rb

@@ -1,72 +1,136 @@
-# Copyright (c) 2005-2014  Ruby-GNOME2 Project Team
+# Copyright (c) 2016 Ruby-GNOME2 Project Team
 # This program is licenced under the same licence as Ruby-GNOME2.
 #
-# $Id: rotated_text.rb,v 1.2 2005/03/05 15:01:16 mutoh Exp $
 =begin
-= Rotated Text
+=  Pango/Rotated Text
 
-This demo shows how to use Cairo and Pango to draw rotated and transformed text.
+ This demo shows how to use PangoCairo to draw rotated and transformed
+ text. The right pane shows a rotated GtkLabel widget.
+
+ In both cases, a custom PangoCairo shape renderer is installed to draw
+ a red heard using cairo drawing operations instead of the Unicode heart
+ character.
 =end
-require "common"
-
-module Demo
-  class RotatedText < BasicWindow
-    RADIUS = 150
-    N_WORDS = 10
-    FONT = "Sans Bold 27"
-
-    def initialize
-      super("Rotated Text")
-
-      drawing_area = Gtk::DrawingArea.new
-      add(drawing_area)
-      drawing_area.override_background_color(:normal, Gdk::RGBA.new(1.0,
-                                                                    1.0,
-                                                                    1.0,
-                                                                    0.0))
-
-      drawing_area.signal_connect("draw") do |_drawing_area, cairo_context|
-        cairo_context.set_source_rgb(1.0, 1.0, 1.0)
-        cairo_context.paint
-        cairo_context.save do
-          width, height = size
-          cairo_context.scale(width.to_f / (RADIUS * 2),
-                              height.to_f / (RADIUS * 2))
-          draw_text(cairo_context)
-        end
-      end
-    end
+module RotatedTextDemo
+  HEART = "♥"
+  RADIUS = 150
+  N_WORDS = 5
+  FONT = "Serif 18"
+  TEXT = "I ♥ GTK+"
 
-    private
-    def draw_text(cairo_context)
-      # Center coordinates on the middle of the region we are drawing
-      cairo_context.translate(RADIUS, RADIUS)
+  def self.run_demo(main_window)
+    window = Gtk::Window.new(:toplevel)
+    window.screen = main_window.screen
+    window.title = "Rotated Text"
+    window.set_default_size(4 * RADIUS, 2 * RADIUS)
 
-      # Create a PangoLayout, set the font and text
-      layout = cairo_context.create_pango_layout
+    box = Gtk::Box.new(:horizontal, 0)
+    box.homogeneous = true
+    window.add(box)
 
-      layout.text = "Text"
-      layout.font_description = Pango::FontDescription.new(FONT)
+    # Add adrawing area
+    drawing_area = Gtk::DrawingArea.new
+    box.add(drawing_area)
+    drawing_area.style_context.add_class("view")
 
-      # Draw the layout N_WORDS times in a circle
-      N_WORDS.times do |i|
-        angle = (360.0 * i) / N_WORDS
+    drawing_area.signal_connect "draw" do |widget, cr|
+      # Create a cairo context and set up a transformation matrix so that the
+      # user space coordinates for the centered square where we draw are
+      # [-RADIUS, RADIUS], [-RADIUS, RADIUS].
+      # We first center, then change the scale.
+      width = widget.allocated_width
+      height = widget.allocated_width
+      device_radius = [width, height].min / 2
+      cr.translate(device_radius + (width - 2 * device_radius) / 2,
+                   device_radius + (height - 2 * device_radius) / 2)
+      cr.scale(device_radius / RADIUS, device_radius / RADIUS)
+
+      # Create a subtle gradient source and use it
+      pattern = Cairo::LinearPattern.new(-RADIUS, -RADIUS, RADIUS, RADIUS)
+      pattern.add_color_stop_rgb(0, 0.5, 0, 0)
+      pattern.add_color_stop_rgb(1, 0, 0, 0.5)
+      cr.set_source(pattern)
 
-        cairo_context.save do
-          # Gradient from red at angle == 60 to blue at angle == 240
-          red = (1 + Math.cos((angle - 60) * Math::PI / 180.0)) / 2
-          cairo_context.set_source_rgb(red, 0.0, 1.0 - red)
+      # Create a PangoContext and set up our shape renderer
+      context = widget.create_pango_context
+      context.set_shape_renderer do |cairo, attr, do_path|
+        fancy_shape_renderer(cairo, attr, do_path)
+      end
 
-          cairo_context.rotate(angle * Math::PI / 180.0)
+      # Create a PangoLayout, set the text, font and attributes
+      layout = Pango::Layout.new(context)
+      layout.text = TEXT
+      desc = Pango::FontDescription.new(FONT)
+      layout.font_description = desc
 
-          # Inform Pango to re-layout the text with the new transformation
-          cairo_context.update_pango_layout(layout)
+      attrs = create_fancy_attr_list_for_layout(layout)
+      layout.attributes = attrs
 
-          width, height = layout.size
-          cairo_context.move_to(-(width / Pango::SCALE) / 2, -RADIUS)
-          cairo_context.show_pango_layout(layout)
-        end
+      # Draw the layout N_WORDS times in a circle
+      N_WORDS.times do
+        # inform Pango to re-layout the text with the new transformation matrix
+        cr.update_pango_layout(layout)
+        w, = layout.pixel_size
+        cr.move_to(- w / 2, - RADIUS * 0.9)
+        cr.show_pango_layout(layout)
+        cr.rotate(Math::PI * 2 / N_WORDS)
       end
+
+      false
+    end
+
+    # And a label
+    label = Gtk::Label.new(TEXT)
+    box.add(label)
+    label.angle = 45
+
+    # Set up fancy stuff on the label
+    layout = label.layout
+    layout.context.set_shape_renderer do |cr, attr, do_path|
+      fancy_shape_renderer(cr, attr, do_path)
     end
+
+    layout.attributes = create_fancy_attr_list_for_layout(layout)
+
+    if !window.visible?
+      window.show_all
+    else
+      window.destroy
+    end
+    window
+  end
+
+  def self.fancy_shape_renderer(cr, attr, do_path)
+    x, y = cr.current_point
+    cr.translate(x, y)
+    cr.scale(attr.ink_rect.width / Pango::SCALE,
+             attr.ink_rect.height / Pango::SCALE)
+
+    if attr.data == HEART
+      cr.move_to(0.5, 0)
+      cr.line_to(0.9, -0.4)
+      cr.curve_to(1.1, -0.8, 0.5, -0.9, 0.5, -0.5)
+      cr.curve_to(0.5, -0.9, -0.1, -0.8, 0.1, -0.4)
+      cr.close_path
+    end
+
+    unless do_path
+      cr.set_source_rgb(1, 0, 0)
+      cr.fill
+    end
+  end
+
+  def self.create_fancy_attr_list_for_layout(layout)
+    metrics = layout.context.get_metrics(layout.font_description)
+    ascent = metrics.ascent
+    logical_rect = Pango::Rectangle.new(0, -ascent, ascent, ascent)
+    ink_rect = logical_rect.dup
+
+    attrs = Pango::AttrList.new
+    attr = Pango::AttrShape.new(ink_rect, logical_rect, HEART)
+    attr.start_index = TEXT[0, TEXT.index(HEART)].bytesize
+    attr.end_index = attr.start_index + HEART.bytesize
+    attrs.insert(attr)
+    attrs
   end
 end

data/sample/gtk-demo/shortcuts-boxes.ui

@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.17 -->
+
+  <object class="GtkShortcutsWindow" id="shortcuts-boxes">
+    <property name="modal">1</property>
+    
+    <child>
+      <object class="GtkShortcutsSection">
+        <property name="visible">1</property>
+        <property name="section-name">shortcuts</property>
+        <property name="max-height">12</property>
+
+        <!-- Overview shortcuts -->
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
+            <property name="title" translatable="yes">Overview</property>
+            <property name="view">overview</property>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">F1</property>
+                <property name="title" translatable="yes">Help</property>
+              </object>
+            </child>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;Ctrl&gt;n</property>
+                <property name="title" translatable="yes">Create a new box</property>
+              </object>
+            </child>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;Ctrl&gt;f</property>
+                <property name="title" translatable="yes">Search</property>
+              </object>
+            </child>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;Ctrl&gt;k</property>
+                <property name="title" translatable="yes">Keyboard shortcuts</property>
+              </object>
+            </child>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;Ctrl&gt;q</property>
+                <property name="title" translatable="yes">Close Window/Quit Boxes</property>
+              </object>
+            </child>
+          </object>
+        </child>
+
+        <!-- Wizard and Properties shortcuts -->
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
+            <property name="title" translatable="yes">Box Creation and Properties</property>
+            <property name="view">wizard</property>
+
+            <!-- LTR -->
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="direction">ltr</property>
+                <property name="accelerator">&lt;Alt&gt;Right</property>
+                <property name="title" translatable="yes">Switch to the next page</property>
+              </object>
+            </child>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="direction">ltr</property>
+                <property name="accelerator">&lt;Alt&gt;Left</property>
+                <property name="title" translatable="yes">Switch to the previous page</property>
+              </object>
+            </child>
+
+            <!-- RTL -->
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="direction">rtl</property>
+                <property name="accelerator">&lt;Alt&gt;Left</property>
+                <property name="title" translatable="yes">Switch to the next page</property>
+              </object>
+            </child>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="direction">rtl</property>
+                <property name="accelerator">&lt;Alt&gt;Right</property>
+                <property name="title" translatable="yes">Switch to the previous page</property>
+              </object>
+            </child>
+          </object>
+        </child>
+
+        <!-- Display shortcuts -->
+        <child>
+          <object class="GtkShortcutsGroup">
+            <property name="visible">1</property>
+            <property name="title" translatable="yes">Box Display</property>
+            <property name="view">display</property>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">Control_L+Alt_L</property>
+                <property name="title" translatable="yes">Grab/Ungrab keyboard</property>
+              </object>
+            </child>
+
+            <!-- LTR -->
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="direction">ltr</property>
+                <property name="accelerator">&lt;Alt&gt;Left</property>
+                <property name="title" translatable="yes">Back to overview</property>
+              </object>
+            </child>
+
+            <!-- RTL -->
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="direction">rtl</property>
+                <property name="accelerator">&lt;Alt&gt;Right</property>
+                <property name="title" translatable="yes">Back to overview</property>
+              </object>
+            </child>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">&lt;Ctrl&gt;q</property>
+                <property name="title" translatable="yes">Close window/Quit Boxes</property>
+              </object>
+            </child>
+
+            <child>
+              <object class="GtkShortcutsShortcut">
+                <property name="visible">1</property>
+                <property name="accelerator">F11</property>
+                <property name="title" translatable="yes">Fullscreen/Restore from fullscreen</property>
+              </object>
+            </child>
+          </object>
+        </child>
+
+      </object>
+    </child>
+  </object>
+
+</interface>