0xmrtt/Gradience
1
0
Fork 0
mirror of https://github.com/GradienceTeam/Gradience.git synced 2024-09-29 06:57:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix issues with CSS parser (partially) (#634)

Browse source 
This fix resolves issue #631, by overriding defaults in `cssutils`
preferences class (specifically `minimizeColorHash`,
`indentClosingBrace`, `omitLastSemicolon`).
This commit is contained in:
tfuxu 2022-10-14 23:04:13 +02:00 committed by GitHub
commit 901dada916
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
data/ui/custom_css_group.blp
View file

@ -3,19 +3,19 @@ using Adw 1;
template GradienceCustomCSSGroup : Adw.PreferencesGroup { template GradienceCustomCSSGroup : Adw.PreferencesGroup {
title: _("Custom CSS"); title: _("Custom CSS");
description: _("Changing this may break some programs. Keep in mind that Libadwaita was made so that applications could hardcode values like paddings and margins. Only GTK 4 CSS will be previewed here."); description: _("Changing this may break some programs. Keep in mind that Libadwaita was made so that applications could hardcode values like paddings and margins.");
[header-suffix] [header-suffix]
DropDown app-type-dropdown { DropDown app_type_dropdown {
valign: start; valign: start;
model: app-type-list; model: app_type_list;
notify => on_dropdown_notify(); notify => on_dropdown_notify();
} }
ScrolledWindow { ScrolledWindow {
min-content-height: 500; min-content-height: 500;
max-content-height: 500; max-content-height: 500;
TextView custom-css-text-view { TextView custom_css_text_view {
styles ["card"] styles ["card"]
left-margin: 10; left-margin: 10;
right-margin: 10; right-margin: 10;
@ -29,6 +29,6 @@ template GradienceCustomCSSGroup : Adw.PreferencesGroup {
} }
} }
StringList app-type-list { StringList app_type_list {
strings [_("GTK 4"), _("GTK 3")] strings [_("GTK 4"), _("GTK 3")]
} }

7
gradience/ui/custom_css_group.py
View file

@ -18,6 +18,7 @@
from gi.repository import Gtk, Adw from gi.repository import Gtk, Adw
from gradience.utils.utils import buglog
from gradience.constants import rootdir from gradience.constants import rootdir
@ -25,8 +26,8 @@ from gradience.constants import rootdir
class GradienceCustomCSSGroup(Adw.PreferencesGroup): class GradienceCustomCSSGroup(Adw.PreferencesGroup):
__gtype_name__ = "GradienceCustomCSSGroup" __gtype_name__ = "GradienceCustomCSSGroup"
app_type_dropdown = Gtk.Template.Child("app-type-dropdown") app_type_dropdown = Gtk.Template.Child("app_type_dropdown")
custom_css_text_view = Gtk.Template.Child("custom-css-text-view") custom_css_text_view = Gtk.Template.Child("custom_css_text_view")
def __init__(self, **kwargs): def __init__(self, **kwargs):
super().__init__(**kwargs) super().__init__(**kwargs)
@ -51,6 +52,8 @@ class GradienceCustomCSSGroup(Adw.PreferencesGroup):
@Gtk.Template.Callback() @Gtk.Template.Callback()
def on_dropdown_notify(self, _unused, pspec): def on_dropdown_notify(self, _unused, pspec):
if pspec.name == "selected": if pspec.name == "selected":
buglog(f"Custom CSS values: {self.custom_css.values()}")
buglog(f"Selected app type in dropdown: {self.app_type_dropdown.get_selected()}")
self.custom_css_text_view.get_buffer().set_text( self.custom_css_text_view.get_buffer().set_text(
list(self.custom_css.values())[ list(self.custom_css.values())[
self.app_type_dropdown.get_selected()] self.app_type_dropdown.get_selected()]

12
gradience/utils/css.py
View file

@ -16,8 +16,11 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>. # along with this program. If not, see <https://www.gnu.org/licenses/>.
import logging
import cssutils import cssutils
# Adwaita palette color name dict
COLORS = [ COLORS = [
"blue_", "blue_",
"green_", "green_",
@ -30,6 +33,13 @@ COLORS = [
"dark_", "dark_",
] ]
# Override cssutils preferences
cssutils.ser.prefs.minimizeColorHash = False
cssutils.ser.prefs.indentClosingBrace = False
cssutils.ser.prefs.omitLastSemicolon = False
# Set cssutils module logging to level FATAL
cssutils.log.setLevel(logging.FATAL)
def load_preset_from_css(path): def load_preset_from_css(path):
css = "" css = ""
@ -53,5 +63,5 @@ def load_preset_from_css(path):
else: else:
variables[name] = color[:-1] variables[name] = color[:-1]
elif rule.type == rule.STYLE_RULE: elif rule.type == rule.STYLE_RULE:
css += f"\n{rule.cssText}" css += f"\n{rule.cssText}\n"
return variables, palette, css return variables, palette, css