Commit 8713c6f2 authored by Glynn Foster's avatar Glynn Foster Committed by Glynn Foster

Remove fast_button_scaling and use GDK_INTERP_HYPER as default instead.

2001-10-18  Glynn Foster  <glynn.foster@sun.com>

	* button-widget.c, gnome-panel-properties.c:
	* panel_config_global.h, session.c:  Remove fast_button_scaling
	  and use GDK_INTERP_HYPER as default instead.
parent e3071cd3
2001-10-18 Glynn Foster <glynn.foster@sun.com>
* button-widget.c, gnome-panel-properties.c:
* panel_config_global.h, session.c: Remove fast_button_scaling
and use GDK_INTERP_HYPER as default instead.
2001-10-18 Glynn Foster <glynn.foster@sun.com>
* basep-widget.c, foobar-widget.c, gnome-panel-properties.c
......
......@@ -617,10 +617,7 @@ button_widget_draw(ButtonWidget *button, guchar *rgb, int rowstride)
double affine[6];
GdkInterpType interp;
if (global_config.fast_button_scaling)
interp = GDK_INTERP_NEAREST;
else
interp = GDK_INTERP_HYPER;
interp = GDK_INTERP_HYPER;
scaled_pb = scale_pixbuf_to_square (pb, size,
NULL, NULL,
......@@ -649,10 +646,7 @@ button_widget_draw(ButtonWidget *button, guchar *rgb, int rowstride)
GdkPixbuf *scaled_pb;
GdkInterpType interp;
if (global_config.fast_button_scaling)
interp = GDK_INTERP_NEAREST;
else
interp = GDK_INTERP_HYPER;
interp = GDK_INTERP_HYPER;
scaled_pb = scale_pixbuf_to_square (pb, size, &w, &h,
interp);
......
......@@ -85,7 +85,6 @@ static GtkWidget *entry_down[LAST_TILE];
static GtkWidget *hide_panel_frame_cb;
static GtkWidget *tile_when_over_cb;
static GtkWidget *saturate_when_over_cb;
static GtkWidget *fast_button_scaling_cb;
/* applet page*/
......@@ -411,8 +410,6 @@ sync_buttons_page_with_config(GlobalConfig *conf)
conf->tile_when_over);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(saturate_when_over_cb),
conf->saturate_when_over);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(fast_button_scaling_cb),
conf->fast_button_scaling);
for(i=0;i<LAST_TILE;i++) {
char *file;
......@@ -439,8 +436,6 @@ sync_config_with_buttons_page(GlobalConfig *conf)
GTK_TOGGLE_BUTTON(tile_when_over_cb)->active;
conf->saturate_when_over =
GTK_TOGGLE_BUTTON(saturate_when_over_cb)->active;
conf->fast_button_scaling =
GTK_TOGGLE_BUTTON(fast_button_scaling_cb)->active;
for(i=0;i<LAST_TILE;i++) {
conf->tiles_enabled[i] =
......@@ -642,12 +637,6 @@ buttons_notebook_page (void)
GTK_SIGNAL_FUNC (changed_cb), NULL);
gtk_box_pack_start (GTK_BOX (vbox), saturate_when_over_cb, FALSE, FALSE, 0);
/* Fast but low quality scaling (Nearest versus Hyperbolic) */
fast_button_scaling_cb = gtk_check_button_new_with_label (_("Fast but low quality scaling of button icons"));
gtk_signal_connect (GTK_OBJECT (fast_button_scaling_cb), "toggled",
GTK_SIGNAL_FUNC (changed_cb), NULL);
gtk_box_pack_start (GTK_BOX (vbox), fast_button_scaling_cb, FALSE, FALSE, 0);
return (vbox);
}
......@@ -1448,8 +1437,6 @@ loadup_vals (void)
conditional_get_bool ("saturate_when_over", TRUE, NULL);
global_config.confirm_panel_remove =
conditional_get_bool ("confirm_panel_remove", TRUE, NULL);
global_config.fast_button_scaling =
conditional_get_bool ("fast_button_scaling", FALSE, NULL);
global_config.avoid_collisions =
conditional_get_bool ("avoid_collisions", TRUE, NULL);
......@@ -1589,7 +1576,6 @@ write_config (GlobalConfig *conf)
gnome_config_set_string("run_key", conf->run_key);
gnome_config_set_string("screenshot_key", conf->screenshot_key);
gnome_config_set_string("window_screenshot_key", conf->window_screenshot_key);
gnome_config_set_bool("fast_button_scaling", conf->fast_button_scaling);
buf = g_string_new(NULL);
for(i=0;i<LAST_TILE;i++) {
......
......@@ -85,7 +85,6 @@ static GtkWidget *entry_down[LAST_TILE];
static GtkWidget *hide_panel_frame_cb;
static GtkWidget *tile_when_over_cb;
static GtkWidget *saturate_when_over_cb;
static GtkWidget *fast_button_scaling_cb;
/* applet page*/
......@@ -411,8 +410,6 @@ sync_buttons_page_with_config(GlobalConfig *conf)
conf->tile_when_over);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(saturate_when_over_cb),
conf->saturate_when_over);
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(fast_button_scaling_cb),
conf->fast_button_scaling);
for(i=0;i<LAST_TILE;i++) {
char *file;
......@@ -439,8 +436,6 @@ sync_config_with_buttons_page(GlobalConfig *conf)
GTK_TOGGLE_BUTTON(tile_when_over_cb)->active;
conf->saturate_when_over =
GTK_TOGGLE_BUTTON(saturate_when_over_cb)->active;
conf->fast_button_scaling =
GTK_TOGGLE_BUTTON(fast_button_scaling_cb)->active;
for(i=0;i<LAST_TILE;i++) {
conf->tiles_enabled[i] =
......@@ -642,12 +637,6 @@ buttons_notebook_page (void)
GTK_SIGNAL_FUNC (changed_cb), NULL);
gtk_box_pack_start (GTK_BOX (vbox), saturate_when_over_cb, FALSE, FALSE, 0);
/* Fast but low quality scaling (Nearest versus Hyperbolic) */
fast_button_scaling_cb = gtk_check_button_new_with_label (_("Fast but low quality scaling of button icons"));
gtk_signal_connect (GTK_OBJECT (fast_button_scaling_cb), "toggled",
GTK_SIGNAL_FUNC (changed_cb), NULL);
gtk_box_pack_start (GTK_BOX (vbox), fast_button_scaling_cb, FALSE, FALSE, 0);
return (vbox);
}
......@@ -1448,8 +1437,6 @@ loadup_vals (void)
conditional_get_bool ("saturate_when_over", TRUE, NULL);
global_config.confirm_panel_remove =
conditional_get_bool ("confirm_panel_remove", TRUE, NULL);
global_config.fast_button_scaling =
conditional_get_bool ("fast_button_scaling", FALSE, NULL);
global_config.avoid_collisions =
conditional_get_bool ("avoid_collisions", TRUE, NULL);
......@@ -1589,7 +1576,6 @@ write_config (GlobalConfig *conf)
gnome_config_set_string("run_key", conf->run_key);
gnome_config_set_string("screenshot_key", conf->screenshot_key);
gnome_config_set_string("window_screenshot_key", conf->window_screenshot_key);
gnome_config_set_bool("fast_button_scaling", conf->fast_button_scaling);
buf = g_string_new(NULL);
for(i=0;i<LAST_TILE;i++) {
......
......@@ -50,7 +50,6 @@ struct _GlobalConfig {
int menu_flags;
gboolean use_large_icons;
gboolean merge_menus;
gboolean fast_button_scaling;
gboolean avoid_collisions;
gboolean menu_check;
};
......
......@@ -50,7 +50,6 @@ struct _GlobalConfig {
int menu_flags;
gboolean use_large_icons;
gboolean merge_menus;
gboolean fast_button_scaling;
gboolean avoid_collisions;
gboolean menu_check;
};
......
......@@ -114,7 +114,6 @@ apply_global_config (void)
static int old_use_large_icons = -1;
static int old_merge_menus = -1;
static int old_menu_check = -1;
static int old_fast_button_scaling = -1;
static int old_avoid_collisions = -1;
GSList *li;
......@@ -224,11 +223,6 @@ apply_global_config (void)
global_config.tile_depth[i]);
}
if (old_fast_button_scaling != global_config.fast_button_scaling) {
button_widget_redo_all ();
}
old_fast_button_scaling = global_config.fast_button_scaling;
for (li = panel_list; li != NULL; li = li->next) {
PanelData *pd = li->data;
if (IS_BASEP_WIDGET (pd->panel)) {
......@@ -1798,8 +1792,6 @@ load_up_globals (void)
conditional_get_bool ("saturate_when_over", TRUE, NULL);
global_config.confirm_panel_remove =
conditional_get_bool ("confirm_panel_remove", TRUE, NULL);
global_config.fast_button_scaling =
conditional_get_bool ("fast_button_scaling", FALSE, NULL);
global_config.avoid_collisions =
conditional_get_bool ("avoid_collisions", TRUE, NULL);
......@@ -1917,8 +1909,6 @@ write_global_config (void)
global_config.screenshot_key);
gnome_config_set_string ("window_screenshot_key",
global_config.window_screenshot_key);
gnome_config_set_bool ("fast_button_scaling",
global_config.fast_button_scaling);
gnome_config_set_bool ("avoid_collisions",
global_config.avoid_collisions);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment