diff options
| author | Yuuki Harano | 2021-02-23 17:53:07 +0900 |
|---|---|---|
| committer | Yuuki Harano | 2021-02-23 17:53:07 +0900 |
| commit | 9f7fde8dc9cae395605b4923324895fbe7c1c8d0 (patch) | |
| tree | 31d0d484512390590a6f033fecbb3880316c3fab /src | |
| parent | be2e47362b0f933dbc8e300e3d168296b7e2aac4 (diff) | |
| download | emacs-9f7fde8dc9cae395605b4923324895fbe7c1c8d0.tar.gz emacs-9f7fde8dc9cae395605b4923324895fbe7c1c8d0.zip | |
Make scrollbars ignore scroll-bar-fore/background.
* src/pgtkfns.c (pgtk_set_scroll_bar_foreground): Handle frame
parameters but actually ignore it.
(pgtk_set_scroll_bar_background): The same.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pgtkfns.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/pgtkfns.c b/src/pgtkfns.c index 07636a25ca0..e9ee2ba13f3 100644 --- a/src/pgtkfns.c +++ b/src/pgtkfns.c | |||
| @@ -853,6 +853,7 @@ pgtk_set_scroll_bar_foreground (struct frame *f, Lisp_Object new_value, | |||
| 853 | if (NILP (new_value)) | 853 | if (NILP (new_value)) |
| 854 | { | 854 | { |
| 855 | gtk_css_provider_load_from_data (css_provider, "", -1, NULL); | 855 | gtk_css_provider_load_from_data (css_provider, "", -1, NULL); |
| 856 | update_face_from_frame_parameter (f, Qscroll_bar_foreground, new_value); | ||
| 856 | } | 857 | } |
| 857 | else if (STRINGP (new_value)) | 858 | else if (STRINGP (new_value)) |
| 858 | { | 859 | { |
| @@ -861,10 +862,14 @@ pgtk_set_scroll_bar_foreground (struct frame *f, Lisp_Object new_value, | |||
| 861 | if (!pgtk_parse_color (f, SSDATA (new_value), &rgb)) | 862 | if (!pgtk_parse_color (f, SSDATA (new_value), &rgb)) |
| 862 | error ("Unknown color."); | 863 | error ("Unknown color."); |
| 863 | 864 | ||
| 865 | /* On pgtk, this frame parameter should be ignored, and honor gtk theme. */ | ||
| 866 | #if 0 | ||
| 864 | char css[64]; | 867 | char css[64]; |
| 865 | sprintf (css, "scrollbar slider { background-color: #%06x; }", | 868 | sprintf (css, "scrollbar slider { background-color: #%06x; }", |
| 866 | (unsigned int) rgb.pixel & 0xffffff); | 869 | (unsigned int) rgb.pixel & 0xffffff); |
| 867 | gtk_css_provider_load_from_data (css_provider, css, -1, NULL); | 870 | gtk_css_provider_load_from_data (css_provider, css, -1, NULL); |
| 871 | #endif | ||
| 872 | update_face_from_frame_parameter (f, Qscroll_bar_foreground, new_value); | ||
| 868 | 873 | ||
| 869 | } | 874 | } |
| 870 | else | 875 | else |
| @@ -881,6 +886,7 @@ pgtk_set_scroll_bar_background (struct frame *f, Lisp_Object new_value, | |||
| 881 | if (NILP (new_value)) | 886 | if (NILP (new_value)) |
| 882 | { | 887 | { |
| 883 | gtk_css_provider_load_from_data (css_provider, "", -1, NULL); | 888 | gtk_css_provider_load_from_data (css_provider, "", -1, NULL); |
| 889 | update_face_from_frame_parameter (f, Qscroll_bar_background, new_value); | ||
| 884 | } | 890 | } |
| 885 | else if (STRINGP (new_value)) | 891 | else if (STRINGP (new_value)) |
| 886 | { | 892 | { |
| @@ -889,10 +895,14 @@ pgtk_set_scroll_bar_background (struct frame *f, Lisp_Object new_value, | |||
| 889 | if (!pgtk_parse_color (f, SSDATA (new_value), &rgb)) | 895 | if (!pgtk_parse_color (f, SSDATA (new_value), &rgb)) |
| 890 | error ("Unknown color."); | 896 | error ("Unknown color."); |
| 891 | 897 | ||
| 898 | /* On pgtk, this frame parameter should be ignored, and honor gtk theme. */ | ||
| 899 | #if 0 | ||
| 892 | char css[64]; | 900 | char css[64]; |
| 893 | sprintf (css, "scrollbar trough { background-color: #%06x; }", | 901 | sprintf (css, "scrollbar trough { background-color: #%06x; }", |
| 894 | (unsigned int) rgb.pixel & 0xffffff); | 902 | (unsigned int) rgb.pixel & 0xffffff); |
| 895 | gtk_css_provider_load_from_data (css_provider, css, -1, NULL); | 903 | gtk_css_provider_load_from_data (css_provider, css, -1, NULL); |
| 904 | #endif | ||
| 905 | update_face_from_frame_parameter (f, Qscroll_bar_background, new_value); | ||
| 896 | 906 | ||
| 897 | } | 907 | } |
| 898 | else | 908 | else |