Merge lp:~grindhold/sakura/fading_addendum into lp:~dabisu/sakura/sakura

[grindhold]

i modified my fading feature, so it works with light themes, too
before it only worked with dark themes :/

[David Gómez (dabisu)]

review: Approve

[David Gómez (dabisu)]

Thanks! Merged.

[David Gómez (dabisu)]

Could you check it the last version in the repository? Fading was working ok before but now it seems some recent change has broke it.

[grindhold (grindhold)]

On 10/07/2016 07:42 PM, David Gómez wrote:
> Could you check it the last version in the repository? Fading was working ok before but now it seems some recent change has broke it.

ahrgs. okay, i'll investigate when i have time. right now i have tasks
for two libraries on my agenda. thanks for the hint.

have a nice weekend

[David Gómez (dabisu)]

Thanks, no hurry. I was looking at it myself but couldn't find the problem.
I'll give it another shot when i have more time and i'm not so sleepy.

On Fri, Oct 7, 2016 at 8:21 PM, grindhold <email address hidden> wrote:

> On 10/07/2016 07:42 PM, David Gómez wrote:
> > Could you check it the last version in the repository? Fading was
> working ok before but now it seems some recent change has broke it.
>
> ahrgs. okay, i'll investigate when i have time. right now i have tasks
> for two libraries on my agenda. thanks for the hint.
>
> have a nice weekend
>
>
> --
> https://code.launchpad.net/~grindhold/sakura/fading_addendum/+merge/299621
> You are reviewing the proposed merge of lp:~grindhold/sakura/fading_addendum
> into lp:sakura.
>

--

David Gómez

=== modified file 'src/sakura.c'
--- src/sakura.c	2016-07-07 10:20:41 +0000
+++ src/sakura.c	2016-07-09 21:39:36 +0000
@@ -43,7 +43,7 @@
 #define _(String) gettext(String)
 #define N_(String) (String)
 #define GETTEXT_PACKAGE "sakura"
-#define FADE_PERCENT 50 
+#define FADE_PERCENT 60 
 
 #define SAY(format,...) do {\
 	if (strcmp("Debug", BUILDTYPE)==0) {\
@@ -1325,25 +1325,47 @@
 static void
 sakura_fade_out()
 {
-	for( int i=0; i<NUM_COLORSETS; i++) {
-		GdkRGBA x = sakura.forecolors[i];
-		x.red = x.red/100.0 * FADE_PERCENT;
-		x.green = x.green/100.0 * FADE_PERCENT;
-		x.blue = x.blue/100.0 * FADE_PERCENT;
-		sakura.forecolors[i]=x;
-	}
+    GdkRGBA x = sakura.forecolors[sakura.last_colorset-1];
+    if( (x.red + x.green + x.blue) / 3.0 > 0.5)  {
+        for( int i=0; i<NUM_COLORSETS; i++) {
+            GdkRGBA x = sakura.forecolors[i];
+            x.red = x.red/100.0 * FADE_PERCENT;
+            x.green = x.green/100.0 * FADE_PERCENT;
+            x.blue = x.blue/100.0 * FADE_PERCENT;
+            sakura.forecolors[i]=x;
+        }
+    } else {
+        for( int i=0; i<NUM_COLORSETS; i++) {
+            GdkRGBA x = sakura.forecolors[i];
+            x.red = 1.0-x.red/100.0 * FADE_PERCENT;
+            x.green = 1.0-x.green/100.0 * FADE_PERCENT;
+            x.blue = 1.0-x.blue/100.0 * FADE_PERCENT;
+            sakura.forecolors[i]=x;
+        }
+    }
 }
 
 static void
 sakura_fade_in()
 {
-	for( int i=0; i<NUM_COLORSETS; i++) {
-		GdkRGBA x = sakura.forecolors[i];
-		x.red = x.red/FADE_PERCENT * 100.0;
-		x.green = x.green/FADE_PERCENT * 100.0;
-		x.blue = x.blue/FADE_PERCENT * 100.0;
-		sakura.forecolors[i]=x;
-	}
+    GdkRGBA x = sakura.forecolors[sakura.last_colorset-1];
+    if( (x.red + x.green + x.blue) / 3.0 > 0.5)  {
+        for( int i=0; i<NUM_COLORSETS; i++) {
+            GdkRGBA x = sakura.forecolors[i];
+            x.red = x.red/FADE_PERCENT * 100.0;
+            x.green = x.green/FADE_PERCENT * 100.0;
+            x.blue = x.blue/FADE_PERCENT * 100.0;
+            sakura.forecolors[i]=x;
+        }
+    } else {
+        for( int i=0; i<NUM_COLORSETS; i++) {
+            GdkRGBA x = sakura.forecolors[i];
+            x.red = 1.0-x.red/FADE_PERCENT * 100.0;
+            x.green = 1.0-x.green/FADE_PERCENT * 100.0;
+            x.blue = 1.0-x.blue/FADE_PERCENT * 100.0;
+            sakura.forecolors[i]=x;
+        }
+    }
 }
 
 static void