提交: 79426dc815202dd2c06d8b31c22178675f314026 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修訂: 79426dc815202dd2c06d8b31c22178675f314026 (tree)
• 時間: 2004-04-01 23:17:36
• 作者: Lars Clausen <lclausen@src....>
• Commiter: Lars Clausen

Log Message

Color and linewidth.

Change Summary

• modified: ChangeLog
• modified: app/color_area.c
• modified: app/linewidth_area.c
• modified: lib/attributes.c

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
[phone]  Lars Clausen  <[e-mail]>
+
+	* app/color_area.c (color_area_create): 
+	* lib/attributes.c: 
+	* app/linewidth_area.c: Also persistent colors and line width.
+	That was easy.  Arrows and line style will take a bit more work,
+	but not much.
+
 2004-04-01  Lars Clausen  <[e-mail]>
 
 	* app/preferences.c:   All preferences are now

--- a/app/color_area.c
+++ b/app/color_area.c
@@ -27,6 +27,7 @@
 
 #include "color_area.h"
 #include "attributes.h"
+#include "persistence.h"
 
 #define FORE_AREA 0
 #define BACK_AREA 1
@@ -453,6 +454,10 @@ color_area_create (int        width,
 {
   GtkWidget *event_box;
 
+  // Won't work on Win32, as color_{black,white} aren't defined.  Why not?
+  attributes_set_foreground(persistence_register_color("fg_color", &color_black));
+  attributes_set_background(persistence_register_color("bg_color", &color_white));
+
   event_box = gtk_event_box_new();
   color_area = gtk_drawing_area_new ();
   gtk_widget_set_size_request (color_area, width, height);

--- a/app/linewidth_area.c
+++ b/app/linewidth_area.c
@@ -168,12 +168,26 @@ linewidth_area_events (GtkWidget *widget,
 }
 
 
+static int
+linewidth_number_from_width(real width)
+{
+  if (fabs(width/BASE_WIDTH-rint(width/BASE_WIDTH)) > 0.0005 ||
+      (width/BASE_WIDTH > NUMLINES)) {
+    return 0;
+  } else {
+    return width/BASE_WIDTH+1.0005;
+  }
+}
+
 GtkWidget *
 linewidth_area_create (void)
 {
   GtkWidget *linewidth_area;
   GtkWidget *event_box;
 
+  attributes_set_default_linewidth(persistence_register_real("linewidth", 0.1));
+  active_linewidth = linewidth_number_from_width(attributes_get_default_linewidth());
+
   event_box = gtk_event_box_new();
   linewidth_area = gtk_drawing_area_new ();
   gtk_drawing_area_size (GTK_DRAWING_AREA (linewidth_area),
@@ -183,7 +197,7 @@ linewidth_area_create (void)
 		    G_CALLBACK(linewidth_area_events),
 		      NULL);
 
-  attributes_set_default_linewidth(BASE_WIDTH*active_linewidth);
+  //  attributes_set_default_linewidth(BASE_WIDTH*active_linewidth);
 
   linewidth_area_widget = linewidth_area;
 
@@ -195,12 +209,7 @@ linewidth_area_create (void)
 static void 
 get_current_line_width() {
   float newvalue = gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(linewidth_button));
-  if (fabs(newvalue/BASE_WIDTH-rint(newvalue/BASE_WIDTH)) > 0.0005 ||
-      (newvalue/BASE_WIDTH > NUMLINES)) {
-    active_linewidth = 0;
-  } else {
-    active_linewidth = newvalue/BASE_WIDTH+1.0005;
-  }
+  active_linewidth = linewidth_number_from_width(newvalue);
   linewidth_area_draw(GTK_WIDGET(linewidth_area_widget));
   attributes_set_default_linewidth(newvalue);
 }

--- a/lib/attributes.c
+++ b/lib/attributes.c
@@ -19,6 +19,7 @@
 
 #include "attributes.h"
 #include "intl.h"
+#include "persistence.h"
 
 static Color attributes_foreground = { 0.0f, 0.0f, 0.0f };
 static Color attributes_background = { 1.0f, 1.0f, 1.0f };
@@ -52,12 +53,14 @@ void
 attributes_set_foreground(Color *color)
 {
   attributes_foreground = *color;
+  persistence_set_color("fg_color", color);
 }
 
 void
 attributes_set_background(Color *color)
 {
   attributes_background = *color;
+  persistence_set_color("bg_color", color);
 }
 
 void
@@ -65,15 +68,15 @@ attributes_swap_fgbg(void)
 {
   Color temp;
   temp = attributes_foreground;
-  attributes_foreground = attributes_background;
-  attributes_background = temp;
+  attributes_set_foreground(&attributes_background);
+  attributes_set_background(&temp);
 }
 
 void
 attributes_default_fgbg(void)
 {
-  attributes_foreground = color_black;
-  attributes_background = color_white;
+  attributes_set_foreground(&color_black);
+  attributes_set_background(&color_white);
 }
 
 real
@@ -86,6 +89,7 @@ void
 attributes_set_default_linewidth(real width)
 {
   attributes_default_linewidth = width;
+  persistence_set_real("linewidth", width);
 }
 
 Arrow