[bijiben] Adapt text color to background.



commit bf5ce3b7b04ffff69a88c5aac634ff70ef9fda5f
Author: mtbar131 <mtbar131 gmail com>
Date:   Sun Jul 20 23:11:59 2014 +0200

    Adapt text color to background.
    
    Whenever note is opened or note color changes,
    change text color to black or white.
    See #726067

 data/{Default.css => Default-black.css} |    2 +-
 data/{Default.css => Default-white.css} |    2 +-
 data/Makefile.am                        |    3 +-
 src/libbiji/editor/biji-webkit-editor.c |   33 +++++++++++++++++++++++++++++++
 src/libbiji/editor/biji-webkit-editor.h |    2 +
 5 files changed, 39 insertions(+), 3 deletions(-)
---
diff --git a/data/Default.css b/data/Default-black.css
similarity index 96%
copy from data/Default.css
copy to data/Default-black.css
index a2b4a61..d319187 100644
--- a/data/Default.css
+++ b/data/Default-black.css
@@ -9,7 +9,7 @@ body {
                                rgba(97%,97%,100%,0) 0%,
                                rgba(97%,97%,100%,0) 90%,
                                rgba(0%,0%,0%,0.15) 100%);
-
+  color:            black;
   background-size:  2.0em 2.0em;
   line-height:      2.0em;
   padding:          2.0em;
diff --git a/data/Default.css b/data/Default-white.css
similarity index 96%
rename from data/Default.css
rename to data/Default-white.css
index a2b4a61..703802b 100644
--- a/data/Default.css
+++ b/data/Default-white.css
@@ -9,7 +9,7 @@ body {
                                rgba(97%,97%,100%,0) 0%,
                                rgba(97%,97%,100%,0) 90%,
                                rgba(0%,0%,0%,0.15) 100%);
-
+  color:            white;
   background-size:  2.0em 2.0em;
   line-height:      2.0em;
   padding:          2.0em;
diff --git a/data/Makefile.am b/data/Makefile.am
index 8bba979..1ceabbd 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -40,7 +40,8 @@ org.gnome.Bijiben.SearchProvider.service: org.gnome.Bijiben.SearchProvider.servi
 searchproviderdir = $(datadir)/gnome-shell/search-providers
 searchprovider_DATA = bijiben-search-provider.ini
 
-css_files = Default.css
+css_files = Default-black.css \
+           Default-white.css
 
 cssdir = $(pkgdatadir)
 css_DATA = $(css_files)
diff --git a/src/libbiji/editor/biji-webkit-editor.c b/src/libbiji/editor/biji-webkit-editor.c
index 443017e..1160004 100644
--- a/src/libbiji/editor/biji-webkit-editor.c
+++ b/src/libbiji/editor/biji-webkit-editor.c
@@ -302,6 +302,9 @@ on_note_color_changed (BijiNoteObj *note, BijiWebkitEditor *self)
 
   if (biji_note_obj_get_rgba(note,&color))
     set_editor_color (GTK_WIDGET (self), &color);
+
+  /*Need to change text color as well*/
+  biji_webkit_editor_change_css_file(self);
 }
 
 
@@ -380,6 +383,9 @@ biji_webkit_editor_constructed (GObject *obj)
                                      "user-changed-contents",
                                      G_CALLBACK (on_content_changed),
                                      NULL);
+
+  /*Add font color*/
+  biji_webkit_editor_change_css_file(self);
 }
 
 static void
@@ -458,3 +464,30 @@ biji_webkit_editor_new (BijiNoteObj *note)
                        "note", note,
                        NULL);
 }
+
+void
+biji_webkit_editor_change_css_file(BijiWebkitEditor *self)
+{
+  BijiWebkitEditorPrivate *priv;
+  gchar *css_path;
+  GdkRGBA color;
+
+  priv = G_TYPE_INSTANCE_GET_PRIVATE (self, BIJI_TYPE_WEBKIT_EDITOR, BijiWebkitEditorPrivate);
+
+  biji_note_obj_get_rgba(priv->note,&color);
+
+  if(color.red < 0.5)
+    css_path = g_build_filename ("file://",
+                                DATADIR, "bijiben",
+                                "Default-white.css",NULL);
+  else
+    css_path = g_build_filename ("file://",
+                                DATADIR, "bijiben",
+                                "Default-black.css",NULL);
+
+  g_object_set (G_OBJECT(priv->settings),
+    "user-stylesheet-uri", css_path, NULL);
+
+  g_free (css_path);
+  return;
+}
diff --git a/src/libbiji/editor/biji-webkit-editor.h b/src/libbiji/editor/biji-webkit-editor.h
index 3a43a12..dd66f28 100644
--- a/src/libbiji/editor/biji-webkit-editor.h
+++ b/src/libbiji/editor/biji-webkit-editor.h
@@ -65,6 +65,8 @@ void biji_webkit_editor_paste (BijiWebkitEditor *self);
 
 void biji_webkit_editor_set_font (BijiWebkitEditor *self, gchar *font);
 
+void biji_webkit_editor_change_css_file(BijiWebkitEditor *self);
+
 G_END_DECLS
 
 #endif /* _WEBKIT_EDITOR_H_ */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]