diff options
29 files changed, 77 insertions, 5 deletions
@@ -1,3 +1,10 @@ +Thu Sep 16 02:07:56 2004 Jonathan Blandford <jrb@gnome.org> + + * docs/tools/widgets.c (create_icon_view): load images at normal + size. + + * docs/reference/gtk/images/*png: Update shots. + Thu Sep 16 00:33:11 2004 Jonathan Blandford <jrb@gnome.org> * docs/tools/widgets.c (new_widget_info): Add constrained sizing diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d1443d531..a9e792458 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Thu Sep 16 02:07:56 2004 Jonathan Blandford <jrb@gnome.org> + + * docs/tools/widgets.c (create_icon_view): load images at normal + size. + + * docs/reference/gtk/images/*png: Update shots. + Thu Sep 16 00:33:11 2004 Jonathan Blandford <jrb@gnome.org> * docs/tools/widgets.c (new_widget_info): Add constrained sizing diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d1443d531..a9e792458 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Thu Sep 16 02:07:56 2004 Jonathan Blandford <jrb@gnome.org> + + * docs/tools/widgets.c (create_icon_view): load images at normal + size. + + * docs/reference/gtk/images/*png: Update shots. + Thu Sep 16 00:33:11 2004 Jonathan Blandford <jrb@gnome.org> * docs/tools/widgets.c (new_widget_info): Add constrained sizing diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d1443d531..a9e792458 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Thu Sep 16 02:07:56 2004 Jonathan Blandford <jrb@gnome.org> + + * docs/tools/widgets.c (create_icon_view): load images at normal + size. + + * docs/reference/gtk/images/*png: Update shots. + Thu Sep 16 00:33:11 2004 Jonathan Blandford <jrb@gnome.org> * docs/tools/widgets.c (new_widget_info): Add constrained sizing diff --git a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml index 2757d674b..8e1a1fb41 100644 --- a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml @@ -60,9 +60,11 @@ End: @filename: @width: @height: -@keep_aspect_ratio: +@preserve_aspect_ratio: @error: @Returns: +<!-- # Unused Parameters # --> +@keep_aspect_ratio: <!-- ##### FUNCTION gdk_pixbuf_get_file_info ##### --> diff --git a/docs/reference/gdk/tmpl/event_structs.sgml b/docs/reference/gdk/tmpl/event_structs.sgml index cad1ae554..b3c80366b 100644 --- a/docs/reference/gdk/tmpl/event_structs.sgml +++ b/docs/reference/gdk/tmpl/event_structs.sgml @@ -417,7 +417,7 @@ only available if the X server supports the XFIXES extension. @owner: the new owner of the selection @reason: the reason for the ownership change as a #GdkOwnerChange value @selection: the atom identifying the selection -@time: the timestamp of the event +@time: the timestamp of the event @selection_time: the time at which the selection ownership was taken over <!-- ##### ENUM GdkScrollDirection ##### --> @@ -509,3 +509,4 @@ Specifies why a selection ownership was changed. @GDK_OWNER_CHANGE_NEW_OWNER: some other app claimed the ownership @GDK_OWNER_CHANGE_DESTROY: the window was destroyed @GDK_OWNER_CHANGE_CLOSE: the client was closed + diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml index 22849e1fc..d7c3d97e9 100644 --- a/docs/reference/gdk/tmpl/rgb.sgml +++ b/docs/reference/gdk/tmpl/rgb.sgml @@ -450,7 +450,7 @@ about which dither mode is desired; if the display is not ditherable, it may make sense to gray out or hide the corresponding UI widget. </para> -@cmap: a #GdkColormap +@cmap: a #GdkColormap @Returns: %TRUE if the visual associated with @cmap is ditherable. diff --git a/docs/reference/gdk/tmpl/windows.sgml b/docs/reference/gdk/tmpl/windows.sgml index 765ea06b0..e1ddb66f1 100644 --- a/docs/reference/gdk/tmpl/windows.sgml +++ b/docs/reference/gdk/tmpl/windows.sgml @@ -723,6 +723,22 @@ Registers a window as a potential drop destination. @y_offset: +<!-- ##### FUNCTION gdk_window_enable_synchronized_configure ##### --> +<para> + +</para> + +@window: + + +<!-- ##### FUNCTION gdk_window_configure_finished ##### --> +<para> + +</para> + +@window: + + <!-- ##### FUNCTION gdk_window_set_user_data ##### --> <para> diff --git a/docs/reference/gtk/images/accel-label.png b/docs/reference/gtk/images/accel-label.png Binary files differindex bcc3324b4..2cd2363b7 100644 --- a/docs/reference/gtk/images/accel-label.png +++ b/docs/reference/gtk/images/accel-label.png diff --git a/docs/reference/gtk/images/button.png b/docs/reference/gtk/images/button.png Binary files differindex 9e7967d28..78bf3cccf 100644 --- a/docs/reference/gtk/images/button.png +++ b/docs/reference/gtk/images/button.png diff --git a/docs/reference/gtk/images/check-button.png b/docs/reference/gtk/images/check-button.png Binary files differindex d5a5da5f2..64f008e52 100644 --- a/docs/reference/gtk/images/check-button.png +++ b/docs/reference/gtk/images/check-button.png diff --git a/docs/reference/gtk/images/color-button.png b/docs/reference/gtk/images/color-button.png Binary files differindex 945cc37e1..6369cd54a 100644 --- a/docs/reference/gtk/images/color-button.png +++ b/docs/reference/gtk/images/color-button.png diff --git a/docs/reference/gtk/images/combo-box-entry.png b/docs/reference/gtk/images/combo-box-entry.png Binary files differindex 14a2ad141..8f6f5167a 100644 --- a/docs/reference/gtk/images/combo-box-entry.png +++ b/docs/reference/gtk/images/combo-box-entry.png diff --git a/docs/reference/gtk/images/entry.png b/docs/reference/gtk/images/entry.png Binary files differindex 7c18542b0..4786ec7b1 100644 --- a/docs/reference/gtk/images/entry.png +++ b/docs/reference/gtk/images/entry.png diff --git a/docs/reference/gtk/images/file-button.png b/docs/reference/gtk/images/file-button.png Binary files differindex 59974c283..04e8ef781 100644 --- a/docs/reference/gtk/images/file-button.png +++ b/docs/reference/gtk/images/file-button.png diff --git a/docs/reference/gtk/images/font-button.png b/docs/reference/gtk/images/font-button.png Binary files differindex ee24e2fa6..a3937da7d 100644 --- a/docs/reference/gtk/images/font-button.png +++ b/docs/reference/gtk/images/font-button.png diff --git a/docs/reference/gtk/images/frame.png b/docs/reference/gtk/images/frame.png Binary files differindex 563378ab7..18e4f9794 100644 --- a/docs/reference/gtk/images/frame.png +++ b/docs/reference/gtk/images/frame.png diff --git a/docs/reference/gtk/images/icon-view.png b/docs/reference/gtk/images/icon-view.png Binary files differindex b3a6ab77f..ce53787cb 100644 --- a/docs/reference/gtk/images/icon-view.png +++ b/docs/reference/gtk/images/icon-view.png diff --git a/docs/reference/gtk/images/label.png b/docs/reference/gtk/images/label.png Binary files differindex b7fc982a4..abb3f3cda 100644 --- a/docs/reference/gtk/images/label.png +++ b/docs/reference/gtk/images/label.png diff --git a/docs/reference/gtk/images/list-and-tree.png b/docs/reference/gtk/images/list-and-tree.png Binary files differindex 260bf4f05..0c6d2ec8e 100644 --- a/docs/reference/gtk/images/list-and-tree.png +++ b/docs/reference/gtk/images/list-and-tree.png diff --git a/docs/reference/gtk/images/multiline-text.png b/docs/reference/gtk/images/multiline-text.png Binary files differindex 7bdeb2fb1..2e3229584 100644 --- a/docs/reference/gtk/images/multiline-text.png +++ b/docs/reference/gtk/images/multiline-text.png diff --git a/docs/reference/gtk/images/panes.png b/docs/reference/gtk/images/panes.png Binary files differindex 4f8f20ba3..be3b15069 100644 --- a/docs/reference/gtk/images/panes.png +++ b/docs/reference/gtk/images/panes.png diff --git a/docs/reference/gtk/images/radio-group.png b/docs/reference/gtk/images/radio-group.png Binary files differindex c08588aa0..092a35db9 100644 --- a/docs/reference/gtk/images/radio-group.png +++ b/docs/reference/gtk/images/radio-group.png diff --git a/docs/reference/gtk/images/separator.png b/docs/reference/gtk/images/separator.png Binary files differindex f1277fd96..9d2ae4d1a 100644 --- a/docs/reference/gtk/images/separator.png +++ b/docs/reference/gtk/images/separator.png diff --git a/docs/reference/gtk/images/toggle-button.png b/docs/reference/gtk/images/toggle-button.png Binary files differindex a0d7a59c9..d147d0e7e 100644 --- a/docs/reference/gtk/images/toggle-button.png +++ b/docs/reference/gtk/images/toggle-button.png diff --git a/docs/reference/gtk/images/window.png b/docs/reference/gtk/images/window.png Binary files differindex 56133166b..926a77302 100644 --- a/docs/reference/gtk/images/window.png +++ b/docs/reference/gtk/images/window.png diff --git a/docs/tools/README.shooter b/docs/tools/README.shooter new file mode 100644 index 000000000..14f7072e6 --- /dev/null +++ b/docs/tools/README.shooter @@ -0,0 +1,13 @@ +The doc shooter is used to take screenshots of widgets for the GTK+ +reference manuals. We use these images for both the headers of the +images, and for the visual index of GNOME images. They aren't part of +the docs build. Instead, the images are taken, and then copied by hand +into gtk+/docs/reference/gtk/images/ + +Ideally, the images should be taken once a release, and all images +should be updated at the same time. A simple theme should be used to +take the screenshots, and in the future, we may include a gtkrc file in +this directory for the shooter to use. Currently, all shots are +constrained to the same width. Care should be taken when adding new +widgets to keep this constraint. + diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index 07d6f80ba..a14299497 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -245,10 +245,10 @@ create_icon_view (void) gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN); list_store = gtk_list_store_new (2, G_TYPE_STRING, GDK_TYPE_PIXBUF); gtk_list_store_append (list_store, &iter); - pixbuf = gdk_pixbuf_new_from_file_at_size ("gnome-gmush.png", 20, 20, NULL); + pixbuf = gdk_pixbuf_new_from_file ("gnome-gmush.png", NULL); gtk_list_store_set (list_store, &iter, 0, "One", 1, pixbuf, -1); gtk_list_store_append (list_store, &iter); - pixbuf = gdk_pixbuf_new_from_file_at_size ("gnome-foot.png", 20, 20, NULL); + pixbuf = gdk_pixbuf_new_from_file ("gnome-foot.png", NULL); gtk_list_store_set (list_store, &iter, 0, "Two", 1, pixbuf, -1); icon_view = gtk_icon_view_new(); diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 4c7bd2778..6516ff11f 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1414,6 +1414,10 @@ gtk_cell_renderer_text_get_size (GtkCellRenderer *cell, { *x_offset = ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? (1.0 - cell->xalign) : cell->xalign) * (cell_area->width - rect.width - (2 * cell->xpad)); + if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) + *x_offset -= rect.width; + if (celltext->text && !strcmp ("Makefile", celltext->text)) + g_print ("x_offset: %d %d %d\n", cell_area->width, *x_offset, rect.width); *x_offset = MAX (*x_offset, 0); } if (y_offset) @@ -1505,6 +1509,8 @@ gtk_cell_renderer_text_render (GtkCellRenderer *cell, else pango_layout_set_width (layout, -1); + if (celltext->text && !strcmp ("Makefile", celltext->text)) + g_print ("render: %d %d %d\n", cell_area->x, cell_area->width, cell_area->x + x_offset + cell->xpad); gtk_paint_layout (widget->style, window, state, @@ -1515,6 +1521,12 @@ gtk_cell_renderer_text_render (GtkCellRenderer *cell, cell_area->x + x_offset + cell->xpad, cell_area->y + y_offset + cell->ypad, layout); + gdk_draw_line (window, widget->style->black_gc, + cell_area->x + x_offset + cell->xpad, + cell_area->y + y_offset + cell->ypad, + cell_area->x + x_offset + cell->xpad, + cell_area->y + y_offset + cell->ypad + 20); + g_object_unref (layout); } |
