Mon Dec 3 16:39:17 2001 Owen Taylor <otaylor@redhat.com> Patch from Bill Haneman (with many modifications) to make the focus color work on dark themes and to make the focus line width configurable. (#61079, #63074) * gtk/gtkwidget.c: Add style properties, ::focus-widget, ::focus-line-width, and ::focus-padding. * gtk/gtkstyle.[ch]: Make gtk_paint_focus() take a state argument as well so we can use fg[STATE] to draw instead of always drawing with black. Cange paint_focus() to respect GtkWidget::focus-width and GtkWidget::focus-line-pattern. Fix continuity problem where the default 1-1 stipple had a blob in one corner and a gap in the other. Change the interpretation of x/y/width/height to be the bounding box of the focus rect instead of the rectangle passed to gdk_draw_rectangle. * gtk/gtkcheckbutton.c gtk/gtklistitem.c gtk/gtknotebook.c gtk/gtkoptionmenu.c gtk/gtkradiobutton.c gtk/gtkspinbutton.c gtk/gtktextview.c gtk/gtktreeview.c: Handle ::focus-width and ::focus-line-padding. * gtk/gtkentry.c: Handle :;focus-width property; cleanup and remove duplicated code; fix drawing of focus rectangle when interior-focus = FALSE. (#63072, #63073) * gtk/gtkrange.c gtk/gtktext.c gtk/gtktreeitem.c gtk/gtktreeviewcolumn.c: Basic fixups to make compile; Range and TreeViewColumn will need more extensive fixing. * gtk/gtkcolorsel.c: Honor focus line attributes when drawing the focus on the color swatches. (#63071) * gtk/gtkhsv.c: Honor focus line attributes when drawing the focus for the ring and triangle. * docs/widget_geometry.txt: Start at documenting how various widgets are drawn. * gtk/gtkbutton.c (_gtk_button_paint): Export _gtk_button_paint() librarywide, so we don't have duplicate a bunch of code in gtktogglebutton.c. * gtk/gtktogglebutton.c: Use _gtk_button_paint().
		
			
				
	
	
		
			122 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			122 lines
		
	
	
		
			4.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* GTK - The GIMP Toolkit
 | 
						|
 * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
 | 
						|
 *
 | 
						|
 * This library is free software; you can redistribute it and/or
 | 
						|
 * modify it under the terms of the GNU Lesser General Public
 | 
						|
 * License as published by the Free Software Foundation; either
 | 
						|
 * version 2 of the License, or (at your option) any later version.
 | 
						|
 *
 | 
						|
 * This library is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | 
						|
 * Lesser General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU Lesser General Public
 | 
						|
 * License along with this library; if not, write to the
 | 
						|
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 | 
						|
 * Boston, MA 02111-1307, USA.
 | 
						|
 */
 | 
						|
 | 
						|
/*
 | 
						|
 * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
 | 
						|
 * file for a list of people on the GTK+ Team.  See the ChangeLog
 | 
						|
 * files for a list of changes.  These files are distributed with
 | 
						|
 * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef __GTK_BUTTON_H__
 | 
						|
#define __GTK_BUTTON_H__
 | 
						|
 | 
						|
 | 
						|
#include <gdk/gdk.h>
 | 
						|
#include <gtk/gtkbin.h>
 | 
						|
#include <gtk/gtkenums.h>
 | 
						|
 | 
						|
 | 
						|
#ifdef __cplusplus
 | 
						|
extern "C" {
 | 
						|
#endif /* __cplusplus */
 | 
						|
 | 
						|
#define GTK_TYPE_BUTTON                 (gtk_button_get_type ())
 | 
						|
#define GTK_BUTTON(obj)                 (GTK_CHECK_CAST ((obj), GTK_TYPE_BUTTON, GtkButton))
 | 
						|
#define GTK_BUTTON_CLASS(klass)         (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_BUTTON, GtkButtonClass))
 | 
						|
#define GTK_IS_BUTTON(obj)              (GTK_CHECK_TYPE ((obj), GTK_TYPE_BUTTON))
 | 
						|
#define GTK_IS_BUTTON_CLASS(klass)      (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BUTTON))
 | 
						|
#define GTK_BUTTON_GET_CLASS(obj)       (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_BUTTON, GtkButtonClass))
 | 
						|
 | 
						|
 | 
						|
typedef struct _GtkButton       GtkButton;
 | 
						|
typedef struct _GtkButtonClass  GtkButtonClass;
 | 
						|
 | 
						|
struct _GtkButton
 | 
						|
{
 | 
						|
  GtkBin bin;
 | 
						|
 | 
						|
  GdkWindow *event_window;
 | 
						|
 | 
						|
  gchar *label_text;
 | 
						|
 | 
						|
  guint activate_timeout;
 | 
						|
 | 
						|
  guint constructed : 1;
 | 
						|
  guint in_button : 1;
 | 
						|
  guint button_down : 1;
 | 
						|
  guint relief : 2;
 | 
						|
  guint use_underline : 1;
 | 
						|
  guint use_stock : 1;
 | 
						|
  guint depressed : 1;
 | 
						|
};
 | 
						|
 | 
						|
struct _GtkButtonClass
 | 
						|
{
 | 
						|
  GtkBinClass        parent_class;
 | 
						|
  
 | 
						|
  void (* pressed)  (GtkButton *button);
 | 
						|
  void (* released) (GtkButton *button);
 | 
						|
  void (* clicked)  (GtkButton *button);
 | 
						|
  void (* enter)    (GtkButton *button);
 | 
						|
  void (* leave)    (GtkButton *button);
 | 
						|
  void (* activate) (GtkButton *button);
 | 
						|
};
 | 
						|
 | 
						|
 | 
						|
GtkType        gtk_button_get_type          (void) G_GNUC_CONST;
 | 
						|
GtkWidget*     gtk_button_new               (void);
 | 
						|
GtkWidget*     gtk_button_new_with_label    (const gchar    *label);
 | 
						|
GtkWidget*     gtk_button_new_from_stock    (const gchar    *stock_id);
 | 
						|
GtkWidget*     gtk_button_new_with_mnemonic (const gchar    *label);
 | 
						|
void           gtk_button_pressed           (GtkButton      *button);
 | 
						|
void           gtk_button_released          (GtkButton      *button);
 | 
						|
void           gtk_button_clicked           (GtkButton      *button);
 | 
						|
void           gtk_button_enter             (GtkButton      *button);
 | 
						|
void           gtk_button_leave             (GtkButton      *button);
 | 
						|
void           gtk_button_set_relief        (GtkButton      *button,
 | 
						|
					     GtkReliefStyle  newstyle);
 | 
						|
GtkReliefStyle gtk_button_get_relief        (GtkButton      *button);
 | 
						|
 | 
						|
void                  gtk_button_set_label         (GtkButton   *button,
 | 
						|
						    const gchar *label);
 | 
						|
G_CONST_RETURN gchar *gtk_button_get_label         (GtkButton   *button);
 | 
						|
void                  gtk_button_set_use_underline (GtkButton   *button,
 | 
						|
						    gboolean     use_underline);
 | 
						|
gboolean              gtk_button_get_use_underline (GtkButton   *button);
 | 
						|
void                  gtk_button_set_use_stock     (GtkButton   *button,
 | 
						|
						    gboolean     use_stock);
 | 
						|
gboolean              gtk_button_get_use_stock     (GtkButton   *button);
 | 
						|
 | 
						|
void _gtk_button_set_depressed (GtkButton    *button,
 | 
						|
				gboolean      depressed);
 | 
						|
void _gtk_button_paint         (GtkButton    *button,
 | 
						|
				GdkRectangle *area,
 | 
						|
				GtkStateType  state_type,
 | 
						|
				GtkShadowType shadow_type,
 | 
						|
				const gchar  *main_detail,
 | 
						|
				const gchar  *default_detail);
 | 
						|
 | 
						|
#ifdef __cplusplus
 | 
						|
}
 | 
						|
#endif /* __cplusplus */
 | 
						|
 | 
						|
 | 
						|
#endif /* __GTK_BUTTON_H__ */
 |