gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

More work on changing parameters for functions that accept and return

Browse source 
* components/news/nautilus-news.c:
	* libnautilus-extensions/nautilus-icon-canvas-item.c:
	* src/nautilus-about.c:
	* src/nautilus-sidebar-tabs.c:
	More work on changing parameters for functions that accept and
	return ArtIRect, EelArtIPoint, ArtDRect, EelDimensions to pass by
	value instead of by pointer.
This commit is contained in:
Ramiro Estrugo 2001-05-01 13:22:36 +00:00
parent 735b256fab
commit bf4553da38
6 changed files with 138 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2001-05-01 Ramiro Estrugo <ramiro@eazel.com>
* components/news/nautilus-news.c:
* libnautilus-extensions/nautilus-icon-canvas-item.c:
* src/nautilus-about.c:
* src/nautilus-sidebar-tabs.c:
More work on changing parameters for functions that accept and
return ArtIRect, EelArtIPoint, ArtDRect, EelDimensions to pass by
value instead of by pointer.
2001-05-01 Ramiro Estrugo <ramiro@eazel.com>
* components/mozilla/main.c: (main): Make warnings and criticals

13
components/news/nautilus-news.c
View file

@ -471,7 +471,8 @@ draw_rss_logo_image (RSSChannelData *channel_data,
time_y_pos = offset + ((gdk_pixbuf_get_height (channel_data->logo_image) - time_dimensions.height) / 2);
eel_scalable_font_draw_text (channel_data->owner->font, pixbuf,
time_x_pos, time_y_pos,
NULL, TIME_FONT_SIZE, time_str, strlen (time_str),
eel_gdk_pixbuf_whole_pixbuf,
TIME_FONT_SIZE, time_str, strlen (time_str),
EEL_RGB_COLOR_BLACK, EEL_OPACITY_FULLY_OPAQUE);
}
}
@ -510,7 +511,7 @@ draw_rss_title (RSSChannelData *channel_data,
if (!measure_only) {
eel_scalable_font_draw_text (channel_data->owner->font, pixbuf,
label_offset, v_offset,
NULL,
eel_gdk_pixbuf_whole_pixbuf,
18,
channel_data->title, strlen (channel_data->title),
EEL_RGB_COLOR_BLACK,
@ -680,7 +681,9 @@ nautilus_news_update_display (News *news_data, gboolean measure_only)
return v_offset;
}
eel_gdk_pixbuf_fill_rectangle_with_color (news_data->pixbuf, NULL, NEWS_BACKGROUND_RGBA);
eel_gdk_pixbuf_fill_rectangle_with_color (news_data->pixbuf,
eel_gdk_pixbuf_whole_pixbuf,
NEWS_BACKGROUND_RGBA);
}
/* loop through the channel list, drawing one channel at a time */
@ -712,7 +715,9 @@ nautilus_news_configure_event (GtkWidget *widget, GdkEventConfigure *event, News
news_data->pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
widget->allocation.width, widget->allocation.height);
eel_gdk_pixbuf_fill_rectangle_with_color (news_data->pixbuf, NULL, NEWS_BACKGROUND_RGBA);
eel_gdk_pixbuf_fill_rectangle_with_color (news_data->pixbuf,
eel_gdk_pixbuf_whole_pixbuf,
NEWS_BACKGROUND_RGBA);
return TRUE;
}

6
libnautilus-extensions/nautilus-icon-canvas-item.c
View file

@ -1693,12 +1693,14 @@ draw_label_text_aa (NautilusIconCanvasItem *icon_item, GnomeCanvasBuf *buf, int
icon_item->details->text_height);
if (needs_highlight) {
container = NAUTILUS_ICON_CONTAINER (GNOME_CANVAS_ITEM (icon_item)->canvas);
eel_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf, NULL,
eel_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf,
eel_gdk_pixbuf_whole_pixbuf,
container->details->highlight_color);
clear_rounded_corners (text_pixbuf, container->details->highlight_frame, 5);
} else {
eel_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf, NULL,
eel_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf,
eel_gdk_pixbuf_whole_pixbuf,
EEL_RGBA_COLOR_PACK (0, 0, 0, 0));
}

6
libnautilus-private/nautilus-icon-canvas-item.c
View file

@ -1693,12 +1693,14 @@ draw_label_text_aa (NautilusIconCanvasItem *icon_item, GnomeCanvasBuf *buf, int
icon_item->details->text_height);
if (needs_highlight) {
container = NAUTILUS_ICON_CONTAINER (GNOME_CANVAS_ITEM (icon_item)->canvas);
eel_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf, NULL,
eel_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf,
eel_gdk_pixbuf_whole_pixbuf,
container->details->highlight_color);
clear_rounded_corners (text_pixbuf, container->details->highlight_frame, 5);
} else {
eel_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf, NULL,
eel_gdk_pixbuf_fill_rectangle_with_color (text_pixbuf,
eel_gdk_pixbuf_whole_pixbuf,
EEL_RGBA_COLOR_PACK (0, 0, 0, 0));
}

7
src/nautilus-about.c
View file

@ -244,13 +244,14 @@ draw_aa_string (EelScalableFont *font,
if (shadow_offset != 0) {
eel_scalable_font_draw_text (font, pixbuf,
x_pos + shadow_offset, y_pos + shadow_offset,
NULL,
eel_gdk_pixbuf_whole_pixbuf,
font_size,
text, strlen (text),
shadow_color, EEL_OPACITY_FULLY_OPAQUE);
}
eel_scalable_font_draw_text (font, pixbuf, x_pos, y_pos, NULL,
eel_scalable_font_draw_text (font, pixbuf, x_pos, y_pos,
eel_gdk_pixbuf_whole_pixbuf,
font_size,
text, strlen (text), color, EEL_OPACITY_FULLY_OPAQUE);
}
@ -426,7 +427,7 @@ nautilus_about_update_authors (NautilusAbout *about)
eel_gdk_pixbuf_fill_rectangle_with_color
(about->details->background_pixbuf,
&author_area,
author_area,
EEL_RGBA_COLOR_PACK (255, 255, 255, 255));
/* randomize the author array */

12
src/nautilus-sidebar-tabs.c
View file

@ -646,7 +646,9 @@ draw_one_tab_plain (NautilusSidebarTabs *sidebar_tabs, GdkGC *gc, char *tab_name
/* allocate the pixbuf and fill it with the background color */
temp_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, name_dimensions.width + indicator_width + 1, name_dimensions.height + 1);
eel_gdk_pixbuf_fill_rectangle_with_color (temp_pixbuf, NULL, eel_gdk_color_to_rgb (foreground_color));
eel_gdk_pixbuf_fill_rectangle_with_color (temp_pixbuf,
eel_gdk_pixbuf_whole_pixbuf,
eel_gdk_color_to_rgb (foreground_color));
/* draw the indicator if necessary */
if (indicator_pixbuf) {
@ -656,7 +658,7 @@ draw_one_tab_plain (NautilusSidebarTabs *sidebar_tabs, GdkGC *gc, char *tab_name
/* draw the name into the pixbuf using anti-aliased text */
eel_scalable_font_draw_text (sidebar_tabs->details->tab_font, temp_pixbuf,
1 + indicator_width, 1,
NULL,
eel_gdk_pixbuf_whole_pixbuf,
sidebar_tabs->details->font_size,
tab_name, strlen (tab_name),
prelight_flag ? EEL_RGB_COLOR_WHITE : EEL_RGB_COLOR_BLACK,
@ -664,7 +666,7 @@ draw_one_tab_plain (NautilusSidebarTabs *sidebar_tabs, GdkGC *gc, char *tab_name
eel_scalable_font_draw_text (sidebar_tabs->details->tab_font, temp_pixbuf,
indicator_width, 0,
NULL,
eel_gdk_pixbuf_whole_pixbuf,
sidebar_tabs->details->font_size,
tab_name, strlen (tab_name),
prelight_flag ? EEL_RGB_COLOR_BLACK : EEL_RGB_COLOR_WHITE,
@ -824,7 +826,7 @@ draw_one_tab_themed (NautilusSidebarTabs *sidebar_tabs, GdkPixbuf *tab_pixbuf, G
eel_scalable_font_draw_text (sidebar_tabs->details->tab_font, tab_pixbuf,
text_x, text_y,
NULL,
eel_gdk_pixbuf_whole_pixbuf,
sidebar_tabs->details->font_size,
tab_name, strlen (tab_name),
EEL_RGB_COLOR_BLACK,
@ -834,7 +836,7 @@ draw_one_tab_themed (NautilusSidebarTabs *sidebar_tabs, GdkPixbuf *tab_pixbuf, G
eel_scalable_font_draw_text (sidebar_tabs->details->tab_font, tab_pixbuf,
text_x, text_y,
NULL,
eel_gdk_pixbuf_whole_pixbuf,
sidebar_tabs->details->font_size,
tab_name, strlen (tab_name),
EEL_RGB_COLOR_WHITE,