removed gimp_config_values_equal().
2002-11-23 Michael Natterer <mitch@gimp.org> * app/config/gimpconfig-utils.[ch]: removed gimp_config_values_equal(). * app/config/gimpconfig-serialize.c * app/config/gimpconfig.c: use g_param_values_cmp() instead so our registered compare methods are used. * app/config/gimpdisplayconfig.[ch]: added "canvas_padding_mode" and "canvas_padding_color" properties. * app/display/display-enums.[ch]: added enum GimpDisplayPaddingMode which can be one of { theme, light check, dark check, custom }. * app/display/gimpdisplay.h * app/display/gimpdisplay-handlers.c: removed cached monitor resolution values... * app/display/gimpdisplayshell.[ch]: ...and added them here. Added padding state as in GimpDisplayConfig. Added utility function gimp_display_shell_set_padding() which hides all the details. Added the new padding modes to the padding color button's context menu. * app/display/gimpdisplayshell-callbacks.[ch]: don't fiddle with colors manually but use gimp_display_shell_set_padding() in realize() and in the color button callbacks. * app/display/gimpdisplayshell-handlers.c: connect to notify::monitor-[xy]resolution and notify::canvas-padding-[mode|color] and update accordingly. * app/widgets/gimppropwidgets.[ch]: added gimp_prop_color_button_new(). * app/widgets/gimpdialogfactory.[ch]: added gimp_dialog_factories_session_clear() (unimplemented). * app/gui/preferences-dialog.c: added widgets for padding mode and color. Removed some callbacks by connecting the functions they called directly. Cleanup.
This commit is contained in:

committed by
Michael Natterer

parent
c618840144
commit
4ce4adf87d
@ -35,9 +35,9 @@
|
||||
|
||||
/* finding the effective screen resolution (double) */
|
||||
#define SCREEN_XRES(s) (s->dot_for_dot ? \
|
||||
s->gdisp->gimage->xresolution : s->gdisp->monitor_xres)
|
||||
s->gdisp->gimage->xresolution : s->monitor_xres)
|
||||
#define SCREEN_YRES(s) (s->dot_for_dot ? \
|
||||
s->gdisp->gimage->yresolution : s->gdisp->monitor_yres)
|
||||
s->gdisp->gimage->yresolution : s->monitor_yres)
|
||||
|
||||
/* calculate scale factors (double) */
|
||||
#define SCALEFACTOR_X(s) ((SCALEDEST(s) * SCREEN_XRES(s)) / \
|
||||
@ -75,6 +75,9 @@ struct _GimpDisplayShell
|
||||
|
||||
GimpItemFactory *item_factory;
|
||||
|
||||
gdouble monitor_xres;
|
||||
gdouble monitor_yres;
|
||||
|
||||
gint scale; /* scale factor from original raw image */
|
||||
gboolean dot_for_dot; /* is monitor resolution being ignored? */
|
||||
|
||||
@ -127,6 +130,8 @@ struct _GimpDisplayShell
|
||||
gint cursor_y; /* software cursor Y value */
|
||||
|
||||
GtkWidget *padding_button; /* GimpColorPanel in the NE corner */
|
||||
GimpDisplayPaddingMode padding_mode;
|
||||
gboolean padding_mode_set;
|
||||
GimpRGB padding_color; /* color of the empty around the image */
|
||||
GdkGC *padding_gc; /* GC with padding_color as BG */
|
||||
|
||||
@ -254,6 +259,10 @@ void gimp_display_shell_update_cursor (GimpDisplayShell *shell,
|
||||
void gimp_display_shell_update_title (GimpDisplayShell *shell);
|
||||
void gimp_display_shell_update_icon (GimpDisplayShell *shell);
|
||||
|
||||
void gimp_display_shell_set_padding (GimpDisplayShell *shell,
|
||||
GimpDisplayPaddingMode mode,
|
||||
GimpRGB *color);
|
||||
|
||||
void gimp_display_shell_draw_guide (GimpDisplayShell *shell,
|
||||
GimpGuide *guide,
|
||||
gboolean active);
|
||||
|
Reference in New Issue
Block a user