[geany/geany] 89d3bf: Merge pull request #1137 from b4n/adwaita-fixes

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Sat, 16 Jul 2016 01:38:06 UTC
Commit:      89d3bf71555a715ce58d7d01bf31cbb308957a5d
             https://github.com/geany/geany/commit/89d3bf71555a715ce58d7d01bf31cbb308957a5d

Log Message:
-----------
Merge pull request #1137 from b4n/adwaita-fixes

Custom theming fixes for Adwaita 3.20/GTK 3.20


Modified Paths:
--------------
    data/geany.css
    data/geany.gtkrc

Modified: data/geany.css
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -20,7 +20,8 @@
 	color: #fff;
 	background: #ff6666;
 }
-#geany-search-entry-no-match:selected {
+#geany-search-entry-no-match:selected /* GTK < 3.20 */,
+#geany-search-entry-no-match selection /* GTK >= 3.20 */ {
 	background-color: #771111;
 }
 


Modified: data/geany.gtkrc
10 lines changed, 10 insertions(+), 0 deletions(-)
===================================================================
@@ -20,6 +20,16 @@ widget "GeanyDialogSearch.*.geany-search-entry-no-match" style "geany-monospace"
 style "geany-search-entry-no-match-style" {
 	base[NORMAL] = "#ffff66666666"
 	text[NORMAL] = "#ffffffffffff"
+	base[SELECTED] = "#777711111111"
+	# try and remove the entry background image on pixmap engine so that our
+	# background color is visible, and we don't end up with white text on white
+	# background (workaround for Adwaita 3.20).
+	engine "pixmap" {
+		image {
+			function = FLAT_BOX
+			detail   = "entry_bg"
+		}
+	}
 }
 widget "*.geany-search-entry-no-match" style "geany-search-entry-no-match-style"
 



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).