added args ::show_text, ::text_xalign, ::text_yalign, ::activity_mode.
Sun Nov 22 16:21:28 1998 Tim Janik <timj@gtk.org> * gtk/gtkprogress.c: added args ::show_text, ::text_xalign, ::text_yalign, ::activity_mode. * gtk/gtkprogressbar.c: added construct arg ::adjustment. added args ::bar_style, ::orientation, ::discrete_blocks, ::activity_step, ::activity_blocks. (gtk_progress_bar_new): (gtk_progress_bar_new_with_adjustment): use gtk_widget_new(). (gtk_progress_bar_construct): deprecated. * gtk/gtkvscrollbar.c: (gtk_vscrollbar_draw_step_back): (gtk_vscrollbar_draw_step_forw): use "vscrollbar" as detail for gtk_paint_arrow, to be consistent with hscrollbar. * gtk/gtktext.c added construct args ::hadjustment, ::vadjustment. added args ::line_wrap, ::word_wrap. (gtk_text_class_init): added scroll_adjustments signal. (gtk_text_new): use gtk_widget_new. (gtk_text_disconnect): remove adjustement with gtk_text_set_adjustments, so we don't screw the reference counts and don't leave signals connected. (gtk_text_destroy): disconnect adjustments signals. (gtk_text_finalize): unref adjustments. * gtk/gtkctree.c: added construct args ::n_columns and ::tree_column. added args ::indent, ::spacing, ::show_stub, ::reorderable, ::use_drag_icons, ::line_style and ::expander_style. (gtk_ctree_set_show_stub): renamed from gtk_ctree_show_stub, which is deprecated now. * gtk/gtkclist.h: remove GTK_CLIST_CONSTRUCT flag. * gtk/gtkclist.c: removed ::vadjustment and ::hadjustment args, introduced ::scroll_adjustments signal. added ::shadow_type, ::selection_mode and ::row_height args. added n_columns construct arg. (gtk_clist_construct): call gtk_object_constructed(). (gtk_clist_set_row_height): if height is passed as 0, revert to automatic height calculation. (gtk_clist_destroy): before unrefing the adjustments, disconnect our signal handlers. Fri Nov 21 22:34:58 1998 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c (gtk_widget_new): call gtk_object_default_construct like gtk_object_new. (gtk_widget_destroy): assert that we only destroy constructed widgets. * gtk/gtkobject.h (enum GtkArgFlags): new flag GTK_ARG_CONSTRUCT_ONLY to identify args that may only be used for construction. GTK_ARG_CONSTRUCT maybe used as normal arguments besides construction time. * gtk/gtkobject.c (gtk_object_new): invoke gtk_object_default_construct at the end if the object is not fully constructed. (gtk_object_newv): likewise. (gtk_object_destroy): assert that we only destroy constructed objects. (gtk_object_init): setup GTK_CONSTRUCTED from the objects real klass. (gtk_object_default_construct): new function to complete default construction of an object by applying missing construtor args with default values of 0, 0.0 or NULL. (gtk_object_constructed): new function to mark an object as being constructed (used from within constructors). * gtk/gtkarg.c (gtk_arg_type_new_static): return the args info pointer so it is immediatedly available for the caller. * gtk/gtktypeutils.c (gtk_type_new): pass an object's real class to the object initilizer (GtkObjectInitFunc takes a second arg now, the real klass), and asure that object initializers may temporarily alter the class pointer. Fri Nov 20 08:00:30 1998 Tim Janik <timj@gtk.org> * gtk/testgtk.c: change all occourances of gtk_container_add ( scrolled_window, widget) to gtk_scrolled_window_add_with_viewport (...) for widget!=(clist, ctree, text, viewport). * gtk/gtkcombo.c: (gtk_combo_init): use gtk_scrolled_window_add_with_viewport() to add children to the scrolled window. * gtk/gtkscrolledwindow.h: * gtk/gtkscrolledwindow.c: changed scrolled_window->viewport to scrolled_window->child, and use gtk_widget_scroll_adjustements() to set the scroll adjustments for the widget, we do not create an additional viewport anymore. added ::hadjustment and ::vadjustment constructor args. (gtk_scrolled_window_new): use gtk_widget_new() to create the widget. (gtk_scrolled_window_set_hadjustment): (gtk_scrolled_window_set_vadjustment): new functions that superceed gtk_scrolled_window_construct. (gtk_scrolled_window_construct): deprecated this function. * gtk/gtkhscrollbar.c: * gtk/gtkvscrollbar.c: * gtk/gtkhscale.c: * gtk/gtkvscale.c: support a constructor arg "::adjustment", and use gtk_widget_new() for the widget creation. * gtk/gtkrange.c: added ::update_policy arg. (gtk_range_set_adjustment): if adjustment is passed in as NULL, create a default adjustment so this function can be used for derived widgets that depend on the adjustment's existance. (gtk_range_destroy): disconnect the adjustment signal, so we don't get called after we got destroyed, we don't destroy the adjustment in here, because it might have been provided from another widget. * gtk/gtkviewport.c: introduced ::scroll_adjustments signal. (gtk_viewport_destroy): same as gtk_range_destroy. * gtk/gtkprogress.c (gtk_progress_destroy): same as gtk_range_destroy. * gtk/gtkwidget.h: * gtk/gtkwidget.c: changed gtk_widget_activate() to return a gboolean, indicating whether this widget supports activation. added gtk_widget_scroll_adjustements() to set the scrolling adjustments of a widget. Wed Nov 19 01:22:42 1998 Tim Janik <timj@gtk.org> * gtk/gtkoptionmenu.c: (gtk_option_menu_remove_contents): (gtk_option_menu_update_contents): removed gtk_container_[un]block_resize() pairs. * gtk/gtknotebook.h: * gtk/gtknotebook.c: removed the tab_border field, since it shouldn't be used outside of gtknotebook.c anyways. made ARG_TAB_BORDER a wrtie-only argument. * *.c: made deprecated functions issue a message: gtk_clist_set_border, gtk_container_block_resize, gtk_container_unblock_resize, gtk_container_need_resize, gtk_object_class_add_user_signal, gtk_spin_button_construct, gtk_scrolled_window_construct. removed non-functional functions: gtk_container_disable_resize, gtk_container_enable_resize, gtk_clist_set_policy. Wed Nov 18 22:54:36 1998 Tim Janik <timj@gtk.org> * gtk/gtkbox.c (gtk_box_init): * gtk/gtkdrawingarea.c (gtk_drawing_area_init): * gtk/gtkeventbox.c (gtk_event_box_init): * gtk/gtkfixed.c (gtk_fixed_init): * gtk/gtkframe.c (gtk_frame_init): * gtk/gtkhandlebox.c (gtk_handle_box_init): * gtk/gtkpacker.c (gtk_packer_init): * gtk/gtkmisc.c (gtk_misc_init): * gtk/gtkpreview.c (gtk_preview_init): * gtk/gtkprogress.c (gtk_progress_init): * gtk/gtkprogressbar.c (gtk_progress_bar_init): * gtk/gtkseparator.c (gtk_separator_init): * gtk/gtktable.c (gtk_table_init): * gtk/gtkviewport.c (gtk_viewport_init): * gtk/gtkalignment.c (gtk_alignment_init): removed setting of the GTK_BASIC flag. * gtk/gtkwidget.h: * gtk/gtkwidget.c: removed GTK_BASIC, GTK_WIDGET_BASIC and gtk_widget_basic. * miscellaneous GtkType and macro fixups.
This commit is contained in:
Tim Janik
@ -25,59 +25,79 @@
|
||||
|
||||
#define RANGE_CLASS(w) GTK_RANGE_CLASS (GTK_OBJECT (w)->klass)
|
||||
|
||||
enum {
|
||||
ARG_0,
|
||||
ARG_ADJUSTMENT,
|
||||
};
|
||||
|
||||
static void gtk_hscrollbar_class_init (GtkHScrollbarClass *klass);
|
||||
static void gtk_hscrollbar_init (GtkHScrollbar *hscrollbar);
|
||||
static void gtk_hscrollbar_set_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_hscrollbar_get_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_hscrollbar_realize (GtkWidget *widget);
|
||||
static void gtk_hscrollbar_size_allocate (GtkWidget *widget,
|
||||
GtkAllocation *allocation);
|
||||
GtkAllocation *allocation);
|
||||
static void gtk_hscrollbar_draw_step_forw (GtkRange *range);
|
||||
static void gtk_hscrollbar_draw_step_back (GtkRange *range);
|
||||
static void gtk_hscrollbar_slider_update (GtkRange *range);
|
||||
static void gtk_hscrollbar_calc_slider_size (GtkHScrollbar *hscrollbar);
|
||||
static gint gtk_hscrollbar_trough_keys (GtkRange *range,
|
||||
GdkEventKey *key,
|
||||
GtkScrollType *scroll,
|
||||
GtkTroughType *pos);
|
||||
GdkEventKey *key,
|
||||
GtkScrollType *scroll,
|
||||
GtkTroughType *pos);
|
||||
|
||||
|
||||
guint
|
||||
GtkType
|
||||
gtk_hscrollbar_get_type (void)
|
||||
{
|
||||
static guint hscrollbar_type = 0;
|
||||
|
||||
static GtkType hscrollbar_type = 0;
|
||||
|
||||
if (!hscrollbar_type)
|
||||
{
|
||||
GtkTypeInfo hscrollbar_info =
|
||||
{
|
||||
"GtkHScrollbar",
|
||||
sizeof (GtkHScrollbar),
|
||||
sizeof (GtkHScrollbarClass),
|
||||
(GtkClassInitFunc) gtk_hscrollbar_class_init,
|
||||
(GtkObjectInitFunc) gtk_hscrollbar_init,
|
||||
/* reserved_1 */ NULL,
|
||||
"GtkHScrollbar",
|
||||
sizeof (GtkHScrollbar),
|
||||
sizeof (GtkHScrollbarClass),
|
||||
(GtkClassInitFunc) gtk_hscrollbar_class_init,
|
||||
(GtkObjectInitFunc) gtk_hscrollbar_init,
|
||||
/* reserved_1 */ NULL,
|
||||
/* reserved_2 */ NULL,
|
||||
(GtkClassInitFunc) NULL,
|
||||
};
|
||||
|
||||
hscrollbar_type = gtk_type_unique (gtk_scrollbar_get_type (), &hscrollbar_info);
|
||||
|
||||
hscrollbar_type = gtk_type_unique (GTK_TYPE_SCROLLBAR, &hscrollbar_info);
|
||||
}
|
||||
|
||||
|
||||
return hscrollbar_type;
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_hscrollbar_class_init (GtkHScrollbarClass *class)
|
||||
{
|
||||
GtkObjectClass *object_class;
|
||||
GtkWidgetClass *widget_class;
|
||||
GtkRangeClass *range_class;
|
||||
|
||||
|
||||
object_class = (GtkObjectClass*) class;
|
||||
widget_class = (GtkWidgetClass*) class;
|
||||
range_class = (GtkRangeClass*) class;
|
||||
|
||||
|
||||
gtk_object_add_arg_type ("GtkHScrollbar::adjustment",
|
||||
GTK_TYPE_ADJUSTMENT,
|
||||
GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
|
||||
ARG_ADJUSTMENT);
|
||||
|
||||
object_class->set_arg = gtk_hscrollbar_set_arg;
|
||||
object_class->get_arg = gtk_hscrollbar_get_arg;
|
||||
|
||||
widget_class->realize = gtk_hscrollbar_realize;
|
||||
widget_class->size_allocate = gtk_hscrollbar_size_allocate;
|
||||
|
||||
|
||||
range_class->draw_step_forw = gtk_hscrollbar_draw_step_forw;
|
||||
range_class->draw_step_back = gtk_hscrollbar_draw_step_back;
|
||||
range_class->slider_update = gtk_hscrollbar_slider_update;
|
||||
@ -86,36 +106,72 @@ gtk_hscrollbar_class_init (GtkHScrollbarClass *class)
|
||||
range_class->motion = gtk_range_default_hmotion;
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_hscrollbar_set_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id)
|
||||
{
|
||||
GtkHScrollbar *hscrollbar;
|
||||
|
||||
hscrollbar = GTK_HSCROLLBAR (object);
|
||||
|
||||
switch (arg_id)
|
||||
{
|
||||
case ARG_ADJUSTMENT:
|
||||
gtk_range_set_adjustment (GTK_RANGE (hscrollbar), GTK_VALUE_POINTER (*arg));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_hscrollbar_get_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id)
|
||||
{
|
||||
GtkHScrollbar *hscrollbar;
|
||||
|
||||
hscrollbar = GTK_HSCROLLBAR (object);
|
||||
|
||||
switch (arg_id)
|
||||
{
|
||||
case ARG_ADJUSTMENT:
|
||||
GTK_VALUE_POINTER (*arg) = GTK_RANGE (hscrollbar);
|
||||
break;
|
||||
default:
|
||||
arg->type = GTK_TYPE_INVALID;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_hscrollbar_init (GtkHScrollbar *hscrollbar)
|
||||
{
|
||||
GtkWidget *widget;
|
||||
GtkRequisition *requisition;
|
||||
|
||||
|
||||
widget = GTK_WIDGET (hscrollbar);
|
||||
requisition = &widget->requisition;
|
||||
|
||||
|
||||
requisition->width = (RANGE_CLASS (widget)->min_slider_size +
|
||||
RANGE_CLASS (widget)->stepper_size +
|
||||
RANGE_CLASS (widget)->stepper_slider_spacing +
|
||||
widget->style->klass->xthickness) * 2;
|
||||
RANGE_CLASS (widget)->stepper_size +
|
||||
RANGE_CLASS (widget)->stepper_slider_spacing +
|
||||
widget->style->klass->xthickness) * 2;
|
||||
requisition->height = (RANGE_CLASS (widget)->slider_width +
|
||||
widget->style->klass->ythickness * 2);
|
||||
widget->style->klass->ythickness * 2);
|
||||
}
|
||||
|
||||
GtkWidget*
|
||||
gtk_hscrollbar_new (GtkAdjustment *adjustment)
|
||||
{
|
||||
GtkHScrollbar *hscrollbar;
|
||||
GtkWidget *hscrollbar;
|
||||
|
||||
hscrollbar = gtk_widget_new (GTK_TYPE_HSCROLLBAR,
|
||||
"adjustment", adjustment,
|
||||
NULL);
|
||||
|
||||
hscrollbar = gtk_type_new (gtk_hscrollbar_get_type ());
|
||||
|
||||
if (!adjustment)
|
||||
adjustment = (GtkAdjustment*) gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
|
||||
|
||||
gtk_range_set_adjustment (GTK_RANGE (hscrollbar), adjustment);
|
||||
|
||||
return GTK_WIDGET (hscrollbar);
|
||||
return hscrollbar;
|
||||
}
|
||||
|
||||
|
||||
@ -125,13 +181,13 @@ gtk_hscrollbar_realize (GtkWidget *widget)
|
||||
GtkRange *range;
|
||||
GdkWindowAttr attributes;
|
||||
gint attributes_mask;
|
||||
|
||||
|
||||
g_return_if_fail (widget != NULL);
|
||||
g_return_if_fail (GTK_IS_HSCROLLBAR (widget));
|
||||
|
||||
|
||||
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
|
||||
range = GTK_RANGE (widget);
|
||||
|
||||
|
||||
attributes.x = widget->allocation.x;
|
||||
attributes.y = widget->allocation.y + (widget->allocation.height - widget->requisition.height) / 2;
|
||||
attributes.width = widget->allocation.width;
|
||||
@ -142,54 +198,54 @@ gtk_hscrollbar_realize (GtkWidget *widget)
|
||||
attributes.colormap = gtk_widget_get_colormap (widget);
|
||||
attributes.event_mask = gtk_widget_get_events (widget);
|
||||
attributes.event_mask |= (GDK_EXPOSURE_MASK |
|
||||
GDK_BUTTON_PRESS_MASK |
|
||||
GDK_BUTTON_RELEASE_MASK |
|
||||
GDK_ENTER_NOTIFY_MASK |
|
||||
GDK_LEAVE_NOTIFY_MASK);
|
||||
|
||||
GDK_BUTTON_PRESS_MASK |
|
||||
GDK_BUTTON_RELEASE_MASK |
|
||||
GDK_ENTER_NOTIFY_MASK |
|
||||
GDK_LEAVE_NOTIFY_MASK);
|
||||
|
||||
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
|
||||
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
|
||||
|
||||
|
||||
range->trough = widget->window;
|
||||
gdk_window_ref (range->trough);
|
||||
|
||||
|
||||
attributes.x = widget->style->klass->xthickness;
|
||||
attributes.y = widget->style->klass->ythickness;
|
||||
attributes.width = RANGE_CLASS (widget)->stepper_size;
|
||||
attributes.height = RANGE_CLASS (widget)->stepper_size;
|
||||
|
||||
|
||||
range->step_back = gdk_window_new (range->trough, &attributes, attributes_mask);
|
||||
|
||||
|
||||
attributes.x = (widget->allocation.width -
|
||||
widget->style->klass->xthickness -
|
||||
RANGE_CLASS (widget)->stepper_size);
|
||||
|
||||
widget->style->klass->xthickness -
|
||||
RANGE_CLASS (widget)->stepper_size);
|
||||
|
||||
range->step_forw = gdk_window_new (range->trough, &attributes, attributes_mask);
|
||||
|
||||
|
||||
attributes.x = 0;
|
||||
attributes.y = widget->style->klass->ythickness;
|
||||
attributes.width = RANGE_CLASS (widget)->min_slider_size;
|
||||
attributes.height = RANGE_CLASS (widget)->slider_width;
|
||||
attributes.event_mask |= (GDK_BUTTON_MOTION_MASK |
|
||||
GDK_POINTER_MOTION_HINT_MASK);
|
||||
|
||||
GDK_POINTER_MOTION_HINT_MASK);
|
||||
|
||||
range->slider = gdk_window_new (range->trough, &attributes, attributes_mask);
|
||||
|
||||
|
||||
gtk_hscrollbar_calc_slider_size (GTK_HSCROLLBAR (widget));
|
||||
gtk_range_slider_update (GTK_RANGE (widget));
|
||||
|
||||
|
||||
widget->style = gtk_style_attach (widget->style, widget->window);
|
||||
|
||||
|
||||
gdk_window_set_user_data (range->trough, widget);
|
||||
gdk_window_set_user_data (range->slider, widget);
|
||||
gdk_window_set_user_data (range->step_forw, widget);
|
||||
gdk_window_set_user_data (range->step_back, widget);
|
||||
|
||||
|
||||
gtk_style_set_background (widget->style, range->trough, GTK_STATE_ACTIVE);
|
||||
gtk_style_set_background (widget->style, range->slider, GTK_STATE_NORMAL);
|
||||
gtk_style_set_background (widget->style, range->step_forw, GTK_STATE_ACTIVE);
|
||||
gtk_style_set_background (widget->style, range->step_back, GTK_STATE_ACTIVE);
|
||||
|
||||
|
||||
gdk_window_show (range->slider);
|
||||
gdk_window_show (range->step_forw);
|
||||
gdk_window_show (range->step_back);
|
||||
@ -197,38 +253,38 @@ gtk_hscrollbar_realize (GtkWidget *widget)
|
||||
|
||||
static void
|
||||
gtk_hscrollbar_size_allocate (GtkWidget *widget,
|
||||
GtkAllocation *allocation)
|
||||
GtkAllocation *allocation)
|
||||
{
|
||||
GtkRange *range;
|
||||
|
||||
|
||||
g_return_if_fail (widget != NULL);
|
||||
g_return_if_fail (GTK_IS_HSCROLLBAR (widget));
|
||||
g_return_if_fail (allocation != NULL);
|
||||
|
||||
|
||||
widget->allocation = *allocation;
|
||||
if (GTK_WIDGET_REALIZED (widget))
|
||||
{
|
||||
range = GTK_RANGE (widget);
|
||||
|
||||
|
||||
gdk_window_move_resize (range->trough,
|
||||
allocation->x,
|
||||
allocation->y + (allocation->height - widget->requisition.height) / 2,
|
||||
allocation->width, widget->requisition.height);
|
||||
allocation->x,
|
||||
allocation->y + (allocation->height - widget->requisition.height) / 2,
|
||||
allocation->width, widget->requisition.height);
|
||||
gdk_window_move_resize (range->step_back,
|
||||
widget->style->klass->xthickness,
|
||||
widget->style->klass->ythickness,
|
||||
RANGE_CLASS (widget)->stepper_size,
|
||||
widget->requisition.height - widget->style->klass->ythickness * 2);
|
||||
widget->style->klass->xthickness,
|
||||
widget->style->klass->ythickness,
|
||||
RANGE_CLASS (widget)->stepper_size,
|
||||
widget->requisition.height - widget->style->klass->ythickness * 2);
|
||||
gdk_window_move_resize (range->step_forw,
|
||||
allocation->width - widget->style->klass->xthickness -
|
||||
RANGE_CLASS (widget)->stepper_size,
|
||||
widget->style->klass->ythickness,
|
||||
RANGE_CLASS (widget)->stepper_size,
|
||||
widget->requisition.height - widget->style->klass->ythickness * 2);
|
||||
allocation->width - widget->style->klass->xthickness -
|
||||
RANGE_CLASS (widget)->stepper_size,
|
||||
widget->style->klass->ythickness,
|
||||
RANGE_CLASS (widget)->stepper_size,
|
||||
widget->requisition.height - widget->style->klass->ythickness * 2);
|
||||
gdk_window_resize (range->slider,
|
||||
RANGE_CLASS (widget)->min_slider_size,
|
||||
widget->requisition.height - widget->style->klass->ythickness * 2);
|
||||
|
||||
RANGE_CLASS (widget)->min_slider_size,
|
||||
widget->requisition.height - widget->style->klass->ythickness * 2);
|
||||
|
||||
gtk_range_slider_update (GTK_RANGE (widget));
|
||||
}
|
||||
}
|
||||
@ -238,32 +294,32 @@ gtk_hscrollbar_draw_step_forw (GtkRange *range)
|
||||
{
|
||||
GtkStateType state_type;
|
||||
GtkShadowType shadow_type;
|
||||
|
||||
|
||||
g_return_if_fail (range != NULL);
|
||||
g_return_if_fail (GTK_IS_HSCROLLBAR (range));
|
||||
|
||||
|
||||
if (GTK_WIDGET_DRAWABLE (range))
|
||||
{
|
||||
if (range->in_child == RANGE_CLASS (range)->step_forw)
|
||||
{
|
||||
if (range->click_child == RANGE_CLASS (range)->step_forw)
|
||||
state_type = GTK_STATE_ACTIVE;
|
||||
else
|
||||
state_type = GTK_STATE_PRELIGHT;
|
||||
}
|
||||
{
|
||||
if (range->click_child == RANGE_CLASS (range)->step_forw)
|
||||
state_type = GTK_STATE_ACTIVE;
|
||||
else
|
||||
state_type = GTK_STATE_PRELIGHT;
|
||||
}
|
||||
else
|
||||
state_type = GTK_STATE_NORMAL;
|
||||
|
||||
state_type = GTK_STATE_NORMAL;
|
||||
|
||||
if (range->click_child == RANGE_CLASS (range)->step_forw)
|
||||
shadow_type = GTK_SHADOW_IN;
|
||||
shadow_type = GTK_SHADOW_IN;
|
||||
else
|
||||
shadow_type = GTK_SHADOW_OUT;
|
||||
|
||||
shadow_type = GTK_SHADOW_OUT;
|
||||
|
||||
gtk_paint_arrow (GTK_WIDGET (range)->style, range->step_forw,
|
||||
state_type, shadow_type,
|
||||
NULL, GTK_WIDGET (range), "hscrollbar",
|
||||
GTK_ARROW_RIGHT,
|
||||
TRUE, 0, 0, -1, -1);
|
||||
state_type, shadow_type,
|
||||
NULL, GTK_WIDGET (range), "hscrollbar",
|
||||
GTK_ARROW_RIGHT,
|
||||
TRUE, 0, 0, -1, -1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -272,32 +328,32 @@ gtk_hscrollbar_draw_step_back (GtkRange *range)
|
||||
{
|
||||
GtkStateType state_type;
|
||||
GtkShadowType shadow_type;
|
||||
|
||||
|
||||
g_return_if_fail (range != NULL);
|
||||
g_return_if_fail (GTK_IS_HSCROLLBAR (range));
|
||||
|
||||
|
||||
if (GTK_WIDGET_DRAWABLE (range))
|
||||
{
|
||||
if (range->in_child == RANGE_CLASS (range)->step_back)
|
||||
{
|
||||
if (range->click_child == RANGE_CLASS (range)->step_back)
|
||||
state_type = GTK_STATE_ACTIVE;
|
||||
else
|
||||
state_type = GTK_STATE_PRELIGHT;
|
||||
}
|
||||
{
|
||||
if (range->click_child == RANGE_CLASS (range)->step_back)
|
||||
state_type = GTK_STATE_ACTIVE;
|
||||
else
|
||||
state_type = GTK_STATE_PRELIGHT;
|
||||
}
|
||||
else
|
||||
state_type = GTK_STATE_NORMAL;
|
||||
|
||||
state_type = GTK_STATE_NORMAL;
|
||||
|
||||
if (range->click_child == RANGE_CLASS (range)->step_back)
|
||||
shadow_type = GTK_SHADOW_IN;
|
||||
shadow_type = GTK_SHADOW_IN;
|
||||
else
|
||||
shadow_type = GTK_SHADOW_OUT;
|
||||
|
||||
gtk_paint_arrow (GTK_WIDGET (range)->style, range->step_back,
|
||||
state_type, shadow_type,
|
||||
NULL, GTK_WIDGET (range), "hscrollbar",
|
||||
GTK_ARROW_LEFT,
|
||||
TRUE, 0, 0, -1, -1);
|
||||
shadow_type = GTK_SHADOW_OUT;
|
||||
|
||||
gtk_paint_arrow (GTK_WIDGET (range)->style, range->step_back,
|
||||
state_type, shadow_type,
|
||||
NULL, GTK_WIDGET (range), "hscrollbar",
|
||||
GTK_ARROW_LEFT,
|
||||
TRUE, 0, 0, -1, -1);
|
||||
}
|
||||
}
|
||||
|
||||
@ -306,7 +362,7 @@ gtk_hscrollbar_slider_update (GtkRange *range)
|
||||
{
|
||||
g_return_if_fail (range != NULL);
|
||||
g_return_if_fail (GTK_IS_HSCROLLBAR (range));
|
||||
|
||||
|
||||
gtk_hscrollbar_calc_slider_size (GTK_HSCROLLBAR (range));
|
||||
gtk_range_default_hslider_update (range);
|
||||
}
|
||||
@ -322,50 +378,50 @@ gtk_hscrollbar_calc_slider_size (GtkHScrollbar *hscrollbar)
|
||||
gint slider_height;
|
||||
gint left, right;
|
||||
gint width;
|
||||
|
||||
|
||||
g_return_if_fail (hscrollbar != NULL);
|
||||
g_return_if_fail (GTK_IS_HSCROLLBAR (hscrollbar));
|
||||
|
||||
|
||||
if (GTK_WIDGET_REALIZED (hscrollbar))
|
||||
{
|
||||
range = GTK_RANGE (hscrollbar);
|
||||
|
||||
|
||||
gdk_window_get_size (range->step_back, &step_back_width, NULL);
|
||||
gdk_window_get_position (range->step_back, &step_back_x, NULL);
|
||||
gdk_window_get_position (range->step_forw, &step_forw_x, NULL);
|
||||
|
||||
|
||||
left = (step_back_x +
|
||||
step_back_width +
|
||||
RANGE_CLASS (hscrollbar)->stepper_slider_spacing);
|
||||
step_back_width +
|
||||
RANGE_CLASS (hscrollbar)->stepper_slider_spacing);
|
||||
right = step_forw_x - RANGE_CLASS (hscrollbar)->stepper_slider_spacing;
|
||||
width = right - left;
|
||||
|
||||
|
||||
if ((range->adjustment->page_size > 0) &&
|
||||
(range->adjustment->lower != range->adjustment->upper))
|
||||
{
|
||||
if (range->adjustment->page_size >
|
||||
(range->adjustment->upper - range->adjustment->lower))
|
||||
range->adjustment->page_size = range->adjustment->upper - range->adjustment->lower;
|
||||
|
||||
width = (width * range->adjustment->page_size /
|
||||
(range->adjustment->upper - range->adjustment->lower));
|
||||
|
||||
if (width < RANGE_CLASS (hscrollbar)->min_slider_size)
|
||||
width = RANGE_CLASS (hscrollbar)->min_slider_size;
|
||||
}
|
||||
|
||||
(range->adjustment->lower != range->adjustment->upper))
|
||||
{
|
||||
if (range->adjustment->page_size >
|
||||
(range->adjustment->upper - range->adjustment->lower))
|
||||
range->adjustment->page_size = range->adjustment->upper - range->adjustment->lower;
|
||||
|
||||
width = (width * range->adjustment->page_size /
|
||||
(range->adjustment->upper - range->adjustment->lower));
|
||||
|
||||
if (width < RANGE_CLASS (hscrollbar)->min_slider_size)
|
||||
width = RANGE_CLASS (hscrollbar)->min_slider_size;
|
||||
}
|
||||
|
||||
gdk_window_get_size (range->slider, &slider_width, &slider_height);
|
||||
|
||||
|
||||
if (slider_width != width)
|
||||
gdk_window_resize (range->slider, width, slider_height);
|
||||
gdk_window_resize (range->slider, width, slider_height);
|
||||
}
|
||||
}
|
||||
|
||||
static gint
|
||||
gtk_hscrollbar_trough_keys(GtkRange *range,
|
||||
GdkEventKey *key,
|
||||
GtkScrollType *scroll,
|
||||
GtkTroughType *pos)
|
||||
GdkEventKey *key,
|
||||
GtkScrollType *scroll,
|
||||
GtkTroughType *pos)
|
||||
{
|
||||
gint return_val = FALSE;
|
||||
switch (key->keyval)
|
||||
@ -381,16 +437,16 @@ gtk_hscrollbar_trough_keys(GtkRange *range,
|
||||
case GDK_Home:
|
||||
return_val = TRUE;
|
||||
if (key->state & GDK_CONTROL_MASK)
|
||||
*scroll = GTK_SCROLL_PAGE_BACKWARD;
|
||||
*scroll = GTK_SCROLL_PAGE_BACKWARD;
|
||||
else
|
||||
*pos = GTK_TROUGH_START;
|
||||
*pos = GTK_TROUGH_START;
|
||||
break;
|
||||
case GDK_End:
|
||||
return_val = TRUE;
|
||||
if (key->state & GDK_CONTROL_MASK)
|
||||
*scroll = GTK_SCROLL_PAGE_FORWARD;
|
||||
*scroll = GTK_SCROLL_PAGE_FORWARD;
|
||||
else
|
||||
*pos = GTK_TROUGH_END;
|
||||
*pos = GTK_TROUGH_END;
|
||||
break;
|
||||
}
|
||||
return return_val;
|
||||
|
||||
Reference in New Issue
Block a user