mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-08-25 02:36:07 +00:00
fixed bug where the increment and decrement images of the zoom control
fixed bug where the increment and decrement images of the zoom control were not being erased at the extremes; also, added ability to use custom numbers via a number strip image.
This commit is contained in:
parent
e225567b68
commit
05e9fc4bd1
15
ChangeLog
15
ChangeLog
|
@ -1,4 +1,19 @@
|
|||
2000-07-26 Andy Hertzfeld <andy@eazel.com>
|
||||
|
||||
* src/nautilus-zoom-control.c:
|
||||
(nautilus_zoom_control_class_initialize), (draw_number),
|
||||
(draw_zoom_control_image), (nautilus_zoom_control_load_images):
|
||||
fixed recently introduced bug where the increment and decrement images were
|
||||
not being erased at the extremes; also, added the optional ability for a theme
|
||||
to define a custom number strip image for the little percentage number.
|
||||
* icons/arlo/Makefile.am:
|
||||
* icons/arlo/number_strip.png:
|
||||
added image for custom numbers to arlo theme
|
||||
* icons/arlo/arlo.xml:
|
||||
added info to theme for new number drawing
|
||||
|
||||
2000-07-26 Rebecca Schulman <rebecka@eazel.com>
|
||||
|
||||
Redid the complex search bar to look the way we actually
|
||||
wanted it. There are still some bugs, but as far as i
|
||||
can tell, it hasn't introduced horrid instability, and
|
||||
|
|
|
@ -6,6 +6,7 @@ arlo_DATA = \
|
|||
i-directory.png \
|
||||
i-regular.png \
|
||||
increment.png \
|
||||
number_strip.png \
|
||||
sidebar_tab_pieces.png \
|
||||
theme_preview.png \
|
||||
zoom_body.png
|
||||
|
|
|
@ -5,6 +5,6 @@
|
|||
PIECE_OFFSETS="1,1,20,4:1,13,20,13:1,47,20,61:1,123,20,139:1,212,20,220:1,5,20,8:1,14,20,14:1,62,20,76:1,16,20,30:1,221,20,229:1,9,20,12:1,15,24,15:1,93,24,107:1,157,20,173:1,194,20,194"
|
||||
LEFT_OFFSET="0" LABEL_COLOR="rgb:FFFF/FFFF/FFFF" TAB_FONT="-*-helvetica-medium-i-normal-*-12-*-*-*-*-*-*-*" />
|
||||
<desktop BACKGROUND_TILE_IMAGE="backgrounds/ice.png"/>
|
||||
<zoom_control NUMBER_V_OFFSET="-4"/>
|
||||
<zoom_control NUMBER_V_OFFSET="-11" DIGIT_WIDTH="6"/>
|
||||
</theme>
|
||||
|
||||
|
|
BIN
icons/arlo/number_strip.png
Normal file
BIN
icons/arlo/number_strip.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 695 B |
|
@ -65,6 +65,7 @@ struct NautilusZoomControlDetails {
|
|||
GdkPixbuf *zoom_body_image;
|
||||
GdkPixbuf *zoom_decrement_image;
|
||||
GdkPixbuf *zoom_increment_image;
|
||||
GdkPixbuf *number_strip;
|
||||
};
|
||||
|
||||
static guint signals[LAST_SIGNAL];
|
||||
|
@ -172,8 +173,6 @@ nautilus_zoom_control_class_initialize (NautilusZoomControlClass *class)
|
|||
GTK_TYPE_NONE, 0);
|
||||
|
||||
gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
|
||||
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -268,13 +267,16 @@ get_zoom_offset (const char *property)
|
|||
return result;
|
||||
}
|
||||
|
||||
/* draw the current zoom percentage */
|
||||
/* draw the current zoom percentage, using a custom number strip if one is available, or
|
||||
using the ordinary text routines otherwise */
|
||||
void draw_number (GtkWidget *widget, GdkRectangle *box)
|
||||
{
|
||||
char buffer[8];
|
||||
char *cur_char;
|
||||
GdkFont *label_font;
|
||||
GdkGC* temp_gc;
|
||||
int x, y, percent;
|
||||
int char_height, char_width, char_offset;
|
||||
int num_v_offset, num_h_offset;
|
||||
NautilusZoomControl *zoom_control;
|
||||
|
||||
|
@ -282,18 +284,43 @@ void draw_number (GtkWidget *widget, GdkRectangle *box)
|
|||
|
||||
num_v_offset = get_zoom_offset ("NUMBER_V_OFFSET");
|
||||
num_h_offset = get_zoom_offset ("NUMBER_H_OFFSET");
|
||||
|
||||
label_font = gdk_font_load("-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*");
|
||||
temp_gc = gdk_gc_new(widget->window);
|
||||
|
||||
char_width = get_zoom_offset ("DIGIT_WIDTH");
|
||||
if (char_width == 0)
|
||||
char_width = 6;
|
||||
|
||||
percent = floor((100.0 * zoom_control->details->zoom_level) + .5);
|
||||
g_snprintf(buffer, 8, "%d", percent);
|
||||
|
||||
x = num_h_offset + ((box->width - gdk_string_width(label_font, buffer)) >> 1);
|
||||
|
||||
y = zoom_control->details->y_offset + 1 + num_v_offset + (box->height >> 1);
|
||||
x = num_h_offset + ((box->width - char_width * strlen(buffer)) >> 1);
|
||||
|
||||
gdk_draw_string (widget->window, label_font, temp_gc, x, y, &buffer[0]);
|
||||
gdk_font_unref(label_font);
|
||||
temp_gc = gdk_gc_new(widget->window);
|
||||
|
||||
if (zoom_control->details->number_strip) {
|
||||
cur_char = &buffer[0];
|
||||
char_height = gdk_pixbuf_get_height (zoom_control->details->number_strip);
|
||||
while (*cur_char) {
|
||||
/* draw the character */
|
||||
|
||||
char_offset = (*cur_char++ - '0') * char_width;
|
||||
gdk_pixbuf_render_to_drawable_alpha (zoom_control->details->number_strip,
|
||||
widget->window,
|
||||
char_offset, 0, x, y,
|
||||
char_width,
|
||||
char_height,
|
||||
GDK_PIXBUF_ALPHA_BILEVEL, 128, GDK_RGB_DITHER_MAX,
|
||||
0, 0);
|
||||
|
||||
x += char_width;
|
||||
}
|
||||
} else {
|
||||
label_font = gdk_font_load("-bitstream-courier-medium-r-normal-*-9-*-*-*-*-*-*-*");
|
||||
|
||||
x = num_h_offset + ((box->width - gdk_string_width(label_font, buffer)) >> 1);
|
||||
|
||||
gdk_draw_string (widget->window, label_font, temp_gc, x, y, &buffer[0]);
|
||||
gdk_font_unref(label_font);
|
||||
}
|
||||
|
||||
gdk_gc_unref(temp_gc);
|
||||
}
|
||||
|
@ -315,13 +342,17 @@ static void
|
|||
draw_zoom_control_image (GtkWidget *widget, GdkRectangle *box)
|
||||
{
|
||||
NautilusZoomControl *zoom_control;
|
||||
int offset;
|
||||
int offset, width, height;
|
||||
|
||||
zoom_control = NAUTILUS_ZOOM_CONTROL (widget);
|
||||
|
||||
/* draw the decrement symbol if necessary */
|
||||
if (zoom_control->details->zoom_level > zoom_control->details->min_zoom_level) {
|
||||
draw_pixbuf (zoom_control->details->zoom_decrement_image, widget->window, box->x, box->y + zoom_control->details->y_offset);
|
||||
} else {
|
||||
width = gdk_pixbuf_get_width (zoom_control->details->zoom_decrement_image);
|
||||
height = gdk_pixbuf_get_height (zoom_control->details->zoom_decrement_image);
|
||||
gdk_draw_rectangle (widget->window, widget->style->bg_gc[0], TRUE, box->x, box->y + zoom_control->details->y_offset, width, height);
|
||||
}
|
||||
|
||||
offset = gdk_pixbuf_get_width (zoom_control->details->zoom_decrement_image) + GAP_WIDTH;
|
||||
|
@ -332,7 +363,10 @@ draw_zoom_control_image (GtkWidget *widget, GdkRectangle *box)
|
|||
/* draw the increment symbol if necessary */
|
||||
if (zoom_control->details->zoom_level < zoom_control->details->max_zoom_level) {
|
||||
draw_pixbuf (zoom_control->details->zoom_increment_image, widget->window, box->x + offset, box->y + zoom_control->details->y_offset);
|
||||
|
||||
} else {
|
||||
width = gdk_pixbuf_get_width (zoom_control->details->zoom_increment_image);
|
||||
height = gdk_pixbuf_get_height (zoom_control->details->zoom_increment_image);
|
||||
gdk_draw_rectangle (widget->window, widget->style->bg_gc[0], TRUE, box->x + offset, box->y + zoom_control->details->y_offset, width, height);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -416,6 +450,7 @@ nautilus_zoom_control_load_images (NautilusZoomControl *zoom_control)
|
|||
zoom_control->details->zoom_body_image = load_themed_image ("zoom_body.png");
|
||||
zoom_control->details->zoom_decrement_image = load_themed_image ("decrement.png");
|
||||
zoom_control->details->zoom_increment_image = load_themed_image ("increment.png");
|
||||
zoom_control->details->number_strip = load_themed_image ("number_strip.png");
|
||||
|
||||
nautilus_zoom_control_update_offsets (zoom_control);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue