From 4cc2b919fa0ac33c40ef7a67597ef751ce48846c Mon Sep 17 00:00:00 2001 From: Slackhead Date: Mon, 21 May 2018 17:31:54 +0100 Subject: [PATCH 01/11] Change caret style --- qutebrowser/javascript/caret.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js index 7e862befc..009fdfc87 100644 --- a/qutebrowser/javascript/caret.js +++ b/qutebrowser/javascript/caret.js @@ -860,11 +860,22 @@ window._qutebrowser.caret = (function() { " position: absolute;" + " z-index: 2147483647;" + " min-height: 10px;" + - " background-color: #000;" + + " min-width: 0.6em;" + + " background: inherit;" + + " color: inherit;" + + " mix-blend-mode: difference;" + + " filter: invert(50%);" + + " animation: blink 1s step-end infinite;" + + "}"; + const blink = "@keyframes blink {" + + "50% { visibility: hidden; }" + "}"; const node = document.createElement("style"); node.innerHTML = style; document.body.appendChild(node); + const node2 = document.createElement("style"); + node2.innerHTML = blink; + document.body.appendChild(node2); }; /** From f34d1b6ce1099a51f12d5e3f8d40b93fa33b95e4 Mon Sep 17 00:00:00 2001 From: Slackhead Date: Tue, 22 May 2018 10:27:00 +0100 Subject: [PATCH 02/11] Remove inherit styles --- qutebrowser/javascript/caret.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js index 009fdfc87..90cbacd31 100644 --- a/qutebrowser/javascript/caret.js +++ b/qutebrowser/javascript/caret.js @@ -861,8 +861,6 @@ window._qutebrowser.caret = (function() { " z-index: 2147483647;" + " min-height: 10px;" + " min-width: 0.6em;" + - " background: inherit;" + - " color: inherit;" + " mix-blend-mode: difference;" + " filter: invert(50%);" + " animation: blink 1s step-end infinite;" + From 1578a4836c6f171fd52831816757bb19a42079c8 Mon Sep 17 00:00:00 2001 From: Slackhead Date: Tue, 22 May 2018 12:05:22 +0100 Subject: [PATCH 03/11] Add fallback colours if inherit fails --- qutebrowser/javascript/caret.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js index 90cbacd31..6fb172858 100644 --- a/qutebrowser/javascript/caret.js +++ b/qutebrowser/javascript/caret.js @@ -862,6 +862,9 @@ window._qutebrowser.caret = (function() { " min-height: 10px;" + " min-width: 0.6em;" + " mix-blend-mode: difference;" + + " --inherited-color: inherit;" + + " background-color: var(--inherited-color, #fff);" + + " color: var(--inherited-color, #000);" + " filter: invert(50%);" + " animation: blink 1s step-end infinite;" + "}"; From 0fcbc209bbb891d4a69846f11b6341d740585b3a Mon Sep 17 00:00:00 2001 From: Slackhead Date: Wed, 23 May 2018 09:02:50 +0100 Subject: [PATCH 04/11] Add animation stopper/starter --- qutebrowser/javascript/caret.js | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js index 6fb172858..277112ab2 100644 --- a/qutebrowser/javascript/caret.js +++ b/qutebrowser/javascript/caret.js @@ -863,7 +863,7 @@ window._qutebrowser.caret = (function() { " min-width: 0.6em;" + " mix-blend-mode: difference;" + " --inherited-color: inherit;" + - " background-color: var(--inherited-color, #fff);" + + " background-color: var(--inherited-color, #000);" + " color: var(--inherited-color, #000);" + " filter: invert(50%);" + " animation: blink 1s step-end infinite;" + @@ -874,6 +874,7 @@ window._qutebrowser.caret = (function() { const node = document.createElement("style"); node.innerHTML = style; document.body.appendChild(node); + const node2 = document.createElement("style"); node2.innerHTML = blink; document.body.appendChild(node2); @@ -944,7 +945,7 @@ window._qutebrowser.caret = (function() { */ CaretBrowsing.setCaretElementNormalStyle = function() { const element = CaretBrowsing.caretElement; - element.className = "CaretBrowsing_Caret"; + element.ClassName = "CaretBrowsing_Caret"; if (CaretBrowsing.isSelectionCollapsed) { element.style.opacity = "1.0"; } else { @@ -1170,6 +1171,8 @@ window._qutebrowser.caret = (function() { CaretBrowsing.updateCaretOrSelection(true); }, 0); } + + CaretBrowsing.stopAnimation(); }; CaretBrowsing.moveToBlock = function(paragraph, boundary) { @@ -1188,6 +1191,8 @@ window._qutebrowser.caret = (function() { window.setTimeout(() => { CaretBrowsing.updateCaretOrSelection(true); }, 0); + + CaretBrowsing.stopAnimation(); }; CaretBrowsing.toggle = function(value) { @@ -1254,6 +1259,17 @@ window._qutebrowser.caret = (function() { CaretBrowsing.updateIsCaretVisible(); }; + CaretBrowsing.startAnimation = function() { + CaretBrowsing.caretElement.style.animationIterationCount = 'infinite'; + }; + + CaretBrowsing.stopAnimation = function() { + CaretBrowsing.caretElement.style.animationIterationCount = 0; + window.setTimeout(() => { + CaretBrowsing.startAnimation(); + }, 1000); + }; + CaretBrowsing.init = function() { CaretBrowsing.isWindowFocused = document.hasFocus(); From 41a092cd80af7dc24255c1c215471d67fee54142 Mon Sep 17 00:00:00 2001 From: Slackhead Date: Wed, 23 May 2018 10:34:45 +0100 Subject: [PATCH 05/11] Tweak style/animation --- qutebrowser/javascript/caret.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js index 277112ab2..44c6779cf 100644 --- a/qutebrowser/javascript/caret.js +++ b/qutebrowser/javascript/caret.js @@ -859,13 +859,13 @@ window._qutebrowser.caret = (function() { const style = ".CaretBrowsing_Caret {" + " position: absolute;" + " z-index: 2147483647;" + - " min-height: 10px;" + + " min-height: 1em;" + " min-width: 0.6em;" + - " mix-blend-mode: difference;" + " --inherited-color: inherit;" + - " background-color: var(--inherited-color, #000);" + + " background-color: var(--inherited-color, #AAA);" + " color: var(--inherited-color, #000);" + - " filter: invert(50%);" + + " mix-blend-mode: difference;" + + " filter: invert(45%);" + " animation: blink 1s step-end infinite;" + "}"; const blink = "@keyframes blink {" + From d37b2713cf1e1b2bd49f673ded8753088ad15126 Mon Sep 17 00:00:00 2001 From: Slackhead Date: Thu, 31 May 2018 05:45:43 +0100 Subject: [PATCH 06/11] Change min-width to 0.2em --- qutebrowser/javascript/caret.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js index 44c6779cf..5d41d6335 100644 --- a/qutebrowser/javascript/caret.js +++ b/qutebrowser/javascript/caret.js @@ -860,9 +860,9 @@ window._qutebrowser.caret = (function() { " position: absolute;" + " z-index: 2147483647;" + " min-height: 1em;" + - " min-width: 0.6em;" + + " min-width: 0.2em;" + " --inherited-color: inherit;" + - " background-color: var(--inherited-color, #AAA);" + + " background-color: var(--inherited-color, #FFF);" + " color: var(--inherited-color, #000);" + " mix-blend-mode: difference;" + " filter: invert(45%);" + From 8c1080de97c212ab1b1cbad882939f12309270b1 Mon Sep 17 00:00:00 2001 From: Slackhead Date: Thu, 31 May 2018 05:58:05 +0100 Subject: [PATCH 07/11] Change filter value to 85% to really darken it --- qutebrowser/javascript/caret.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js index 5d41d6335..0b3770b46 100644 --- a/qutebrowser/javascript/caret.js +++ b/qutebrowser/javascript/caret.js @@ -865,7 +865,7 @@ window._qutebrowser.caret = (function() { " background-color: var(--inherited-color, #FFF);" + " color: var(--inherited-color, #000);" + " mix-blend-mode: difference;" + - " filter: invert(45%);" + + " filter: invert(85%);" + " animation: blink 1s step-end infinite;" + "}"; const blink = "@keyframes blink {" + From 7858bb97d168968e12450918521956f9ffc9092d Mon Sep 17 00:00:00 2001 From: Slackhead Date: Thu, 31 May 2018 06:33:48 +0100 Subject: [PATCH 08/11] Change default bg colour to #000 --- qutebrowser/javascript/caret.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js index 0b3770b46..800a27735 100644 --- a/qutebrowser/javascript/caret.js +++ b/qutebrowser/javascript/caret.js @@ -862,7 +862,7 @@ window._qutebrowser.caret = (function() { " min-height: 1em;" + " min-width: 0.2em;" + " --inherited-color: inherit;" + - " background-color: var(--inherited-color, #FFF);" + + " background-color: var(--inherited-color, #000);" + " color: var(--inherited-color, #000);" + " mix-blend-mode: difference;" + " filter: invert(85%);" + From c3771ca2b2a07db8e33c71674ce4649a00f65337 Mon Sep 17 00:00:00 2001 From: Slackhead Date: Sat, 9 Jun 2018 19:45:48 +0100 Subject: [PATCH 09/11] double quoted and className corrected --- qutebrowser/javascript/caret.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js index 800a27735..f394de9d2 100644 --- a/qutebrowser/javascript/caret.js +++ b/qutebrowser/javascript/caret.js @@ -945,7 +945,7 @@ window._qutebrowser.caret = (function() { */ CaretBrowsing.setCaretElementNormalStyle = function() { const element = CaretBrowsing.caretElement; - element.ClassName = "CaretBrowsing_Caret"; + element.className = "CaretBrowsing_Caret"; if (CaretBrowsing.isSelectionCollapsed) { element.style.opacity = "1.0"; } else { @@ -1260,7 +1260,7 @@ window._qutebrowser.caret = (function() { }; CaretBrowsing.startAnimation = function() { - CaretBrowsing.caretElement.style.animationIterationCount = 'infinite'; + CaretBrowsing.caretElement.style.animationIterationCount = "infinite"; }; CaretBrowsing.stopAnimation = function() { From 35a1e118f8d46ec371d58304065302b291414df4 Mon Sep 17 00:00:00 2001 From: Slackhead Date: Tue, 12 Jun 2018 04:25:13 +0100 Subject: [PATCH 10/11] combine style nodes --- qutebrowser/javascript/caret.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js index f394de9d2..ece177088 100644 --- a/qutebrowser/javascript/caret.js +++ b/qutebrowser/javascript/caret.js @@ -867,17 +867,13 @@ window._qutebrowser.caret = (function() { " mix-blend-mode: difference;" + " filter: invert(85%);" + " animation: blink 1s step-end infinite;" + - "}"; - const blink = "@keyframes blink {" + + "}" + + "@keyframes blink {" + "50% { visibility: hidden; }" + "}"; const node = document.createElement("style"); node.innerHTML = style; document.body.appendChild(node); - - const node2 = document.createElement("style"); - node2.innerHTML = blink; - document.body.appendChild(node2); }; /** From 088c7b235d805b70f1be198e4f3c005c4da2ff5e Mon Sep 17 00:00:00 2001 From: Slackhead Date: Tue, 12 Jun 2018 11:22:41 +0100 Subject: [PATCH 11/11] fix for qt 5.7.1 --- qutebrowser/javascript/caret.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js index ece177088..837288346 100644 --- a/qutebrowser/javascript/caret.js +++ b/qutebrowser/javascript/caret.js @@ -861,15 +861,11 @@ window._qutebrowser.caret = (function() { " z-index: 2147483647;" + " min-height: 1em;" + " min-width: 0.2em;" + - " --inherited-color: inherit;" + - " background-color: var(--inherited-color, #000);" + - " color: var(--inherited-color, #000);" + - " mix-blend-mode: difference;" + - " filter: invert(85%);" + + " background-color: #000;" + " animation: blink 1s step-end infinite;" + "}" + "@keyframes blink {" + - "50% { visibility: hidden; }" + + " 50% { visibility: hidden; }" + "}"; const node = document.createElement("style"); node.innerHTML = style;