gimp r25165 - in trunk: . app/core app/display
- From: neo svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r25165 - in trunk: . app/core app/display
- Date: Fri, 21 Mar 2008 22:09:23 +0000 (GMT)
Author: neo
Date: Fri Mar 21 22:09:23 2008
New Revision: 25165
URL: http://svn.gnome.org/viewvc/gimp?rev=25165&view=rev
Log:
2008-03-21 Sven Neumann <sven gimp org>
* app/core/gimptemplate.[ch]: moved defines to the header file
and
changed to 640x400 which is actually almost the golden mean as
claimed by the comment.
* app/display/gimpdisplayshell.c: use the defines here.
Modified:
trunk/ChangeLog
trunk/app/core/gimptemplate.c
trunk/app/core/gimptemplate.h
trunk/app/display/gimpdisplayshell.c
Modified: trunk/app/core/gimptemplate.c
==============================================================================
--- trunk/app/core/gimptemplate.c (original)
+++ trunk/app/core/gimptemplate.c Fri Mar 21 22:09:23 2008
@@ -40,19 +40,6 @@
#include "gimp-intl.h"
-/* The default image aspect ratio is the golden mean. We use
- * two adjacent fibonacci numbers for the unstable series and
- * some less odd values for the stable version.
- */
-
-#ifdef GIMP_UNSTABLE
-#define DEFAULT_IMAGE_WIDTH 610
-#define DEFAULT_IMAGE_HEIGHT 377
-#else
-#define DEFAULT_IMAGE_WIDTH 600
-#define DEFAULT_IMAGE_HEIGHT 480
-#endif
-
#define DEFAULT_RESOLUTION 72.0
@@ -108,12 +95,12 @@
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_WIDTH, "width",
NULL,
GIMP_MIN_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE,
- DEFAULT_IMAGE_WIDTH,
+ GIMP_DEFAULT_IMAGE_WIDTH,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_HEIGHT, "height",
NULL,
GIMP_MIN_IMAGE_SIZE, GIMP_MAX_IMAGE_SIZE,
- DEFAULT_IMAGE_HEIGHT,
+ GIMP_DEFAULT_IMAGE_HEIGHT,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_UNIT (object_class, PROP_UNIT, "unit",
N_("The unit used for coordinate display "
Modified: trunk/app/core/gimptemplate.h
==============================================================================
--- trunk/app/core/gimptemplate.h (original)
+++ trunk/app/core/gimptemplate.h Fri Mar 21 22:09:23 2008
@@ -26,6 +26,20 @@
#include "gimpviewable.h"
+/* The default image aspect ratio is the golden mean. We use
+ * two adjacent fibonacci numbers for the unstable series and
+ * some less odd values for the stable version.
+ */
+
+#ifdef GIMP_UNSTABLE
+#define GIMP_DEFAULT_IMAGE_WIDTH 610
+#define GIMP_DEFAULT_IMAGE_HEIGHT 377
+#else
+#define GIMP_DEFAULT_IMAGE_WIDTH 640
+#define GIMP_DEFAULT_IMAGE_HEIGHT 400
+#endif
+
+
#define GIMP_TYPE_TEMPLATE (gimp_template_get_type ())
#define GIMP_TEMPLATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEMPLATE, GimpTemplate))
#define GIMP_TEMPLATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEMPLATE, GimpTemplateClass))
Modified: trunk/app/display/gimpdisplayshell.c
==============================================================================
--- trunk/app/display/gimpdisplayshell.c (original)
+++ trunk/app/display/gimpdisplayshell.c Fri Mar 21 22:09:23 2008
@@ -45,6 +45,7 @@
#include "core/gimpprojection.h"
#include "core/gimpmarshal.h"
#include "core/gimpsamplepoint.h"
+#include "core/gimptemplate.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimpmenufactory.h"
@@ -668,10 +669,7 @@
/* the toplevel shell */
shell = g_object_new (GIMP_TYPE_DISPLAY_SHELL,
- "window-position", (display->image ?
- GTK_WIN_POS_MOUSE :
- GTK_WIN_POS_CENTER),
- "unit", unit,
+ "unit", unit,
NULL);
shell->display = display;
@@ -683,8 +681,8 @@
}
else
{
- image_width = 640;
- image_height = 480;
+ image_width = GIMP_DEFAULT_IMAGE_WIDTH;
+ image_height = GIMP_DEFAULT_IMAGE_HEIGHT;
}
shell->dot_for_dot = shell->display->config->default_dot_for_dot;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]