[Fencommits] fenfire-hs: resolve conflict

[Benja Fallenstein]

Thu Feb 15 15:53:00 EET 2007  Benja Fallenstein <benja.fallenstein at gmail.com>
  * resolve conflict
diff -rN -u old-fenfire-hs-1/Fenfire.fhs new-fenfire-hs-1/Fenfire.fhs
--- old-fenfire-hs-1/Fenfire.fhs	2007-02-15 15:54:13.000000000 +0200
+++ new-fenfire-hs-1/Fenfire.fhs	2007-02-15 15:54:13.000000000 +0200
@@ -618,20 +618,29 @@
 
     uriMaker <- newURIMaker
 
+    -- initial state:
+
+    args <- initGUI
+
+    window <- windowNew
+    style <- widgetGetStyle window
+
+    bgColor <- styleGetBackground StateSelected style
+    blurBgColor <- styleGetBackground StateActive style
+    focusColor <- styleGetBase StateSelected style
+    blurColor <- styleGetBase StateActive style
+    textColor <- styleGetText StateSelected style
+    blurTextColor <- styleGetText StateActive style
+
     let ?vs = ViewSettings { hiddenProps=[rdfs_label] }
         ?uriMaker = uriMaker in let
         ?views = [("Wheel view", vanishingView 20 30 
-                     (Color 0.7 0.7 0.8 0.7) (Color 0.7 0.7 0.7 0.7)
-                     (Color 0.93 0.93 1 1)   (Color 0.93 0.93 0.93 1)),
+                       (fromGtkColor bgColor)    (fromGtkColor blurBgColor)
+                       (fromGtkColor focusColor) (fromGtkColor blurColor)
+                       (fromGtkColor textColor)  (fromGtkColor blurTextColor)),
                   ("Presentation view", presentationView)] in do
 
-    -- initial state:
-
-    args <- initGUI
-
-    let view = vanishingView 20 30 
-                   (Color 0.7 0.7 0.8 0.7) (Color 0.7 0.7 0.7 0.7)
-                   (Color 0.93 0.93 1 1)   (Color 0.93 0.93 0.93 1)
+    let view s = snd (?views !! fsView s) s
 
     stateRef <- case args of 
         [] -> do