Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix and expose set_style #29

Closed
wants to merge 2 commits into from
Closed

Fix and expose set_style #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ab6285
Fix and expose set_style
Kobzol Sep 30, 2020
e9914ac
Fix compose in set_style
Kobzol Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion elsie/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .arrow import Arrow # noqa
from .slides import Slides, slide, render, get_global_slides, set_global_slides # noqa
from .slides import get_style, update_style, get_style # noqa
from .slides import get_style, update_style, get_style, set_style # noqa
from .textstyle import TextStyle # noqa
4 changes: 2 additions & 2 deletions elsie/slides.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def set_style(self, style_name, style, base="default"):
assert isinstance(style_name, str)
assert isinstance(style, TextStyle)
if base != "default":
style = self.get_style(base).update(style)
style = self.get_style(base).compose(style)
self._styles = self._styles.copy()
self._styles[style_name] = style

Expand Down Expand Up @@ -258,7 +258,7 @@ def get_style(style, full_style=True):
return get_global_slides().get_style(style, full_style)


def set_style(style_name, style, base=None):
def set_style(style_name, style, base="default"):
"""Call set_style method on global slides"""
get_global_slides().set_style(style_name, style, base)

Expand Down