alihan/textual
1
0
Fork 0
mirror of https://github.com/Textualize/textual.git synced 2025-10-17 02:38:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renaming opacity to text-opacity in code

Browse Source
This commit is contained in:
Darren Burns
2022-08-31 13:39:34 +01:00
parent 786e2ee5fd
commit 210214260d
15 changed files with 126 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/examples/basic.css
View File

@@ -46,7 +46,7 @@ DirectoryTree {
DataTable {
/*border:heavy red;*/
/* tint: 10% green; */
/* opacity: 50%; */
/* text-opacity: 50%; */
padding: 1;
margin: 1 2;
height: 24;

4
docs/examples/introduction/stopwatch.css
View File

@@ -9,7 +9,7 @@ Stopwatch {
TimeDisplay {
content-align: center middle;
opacity: 60%;
text-opacity: 60%;
height: 3;
}
@@ -37,7 +37,7 @@ Button {
}
.started TimeDisplay {
opacity: 100%;
text-opacity: 100%;
}
.started #start {

2
docs/examples/introduction/stopwatch03.css
View File

@@ -8,7 +8,7 @@ Stopwatch {
TimeDisplay {
content-align: center middle;
opacity: 60%;
text-opacity: 60%;
height: 3;
}

4
docs/examples/introduction/stopwatch04.css
View File

@@ -9,7 +9,7 @@ Stopwatch {
TimeDisplay {
content-align: center middle;
opacity: 60%;
text-opacity: 60%;
height: 3;
}
@@ -37,7 +37,7 @@ Button {
}
.started TimeDisplay {
opacity: 100%;
text-opacity: 100%;
}
.started #start {

2
e2e_tests/test_apps/basic.css
View File

@@ -27,7 +27,7 @@ App > Screen {
DataTable {
/*border:heavy red;*/
/* tint: 10% green; */
/* opacity: 50%; */
/* text-opacity: 50%; */
padding: 1;
margin: 1 2;
height: 12;

2
sandbox/darren/buttons.css
View File

@@ -1,4 +1,6 @@
Button {
padding-left: 1;
padding-right: 1;
margin: 3;
text-opacity: 30%;
}

16
sandbox/darren/just_a_box.py
View File

@@ -26,15 +26,15 @@ class JustABox(App):
yield Box(classes="box2")
def key_a(self):
self.box.styles.display = "none"
# self.box.styles.display = "none"
# self.box.styles.visibility = "hidden"
# self.animator.animate(
# self.box.styles,
# "opacity",
# value=0.0,
# duration=2.0,
# on_complete=self.box.remove,
# )
self.animator.animate(
self.box.styles,
"text_opacity",
value=0.0,
duration=2.0,
on_complete=self.box.remove,
)
async def on_key(self, event: events.Key) -> None:
await self.dispatch_key(event)

4
sandbox/dev_sandbox.scss
View File

@@ -54,7 +54,7 @@ Widget:hover {
}
#footer {
opacity: 1;
text-opacity: 1;
color: $text;
background: $background;
height: 3;
@@ -62,5 +62,5 @@ Widget:hover {
}
#footer.dim {
opacity: 0.5;
text-opacity: 0.5;
}

2
sandbox/will/basic.css
View File

@@ -46,7 +46,7 @@ DirectoryTree {
DataTable {
/*border:heavy red;*/
/* tint: 10% green; */
/* opacity: 50%; */
/* text-opacity: 50%; */
padding: 1;
margin: 1 2;
height: 24;

4
src/textual/_styles_cache.py
View File

@@ -237,8 +237,8 @@ class StylesCache:
Returns:
list[Segment]: New list of segments
"""
if styles.opacity != 1.0:
segments = Opacity.process_segments(segments, styles.opacity)
if styles.text_opacity != 1.0:
segments = Opacity.process_segments(segments, styles.text_opacity)
if styles.tint.a:
segments = Tint.process_segments(segments, styles.tint)
return segments if isinstance(segments, list) else list(segments)

11
src/textual/css/_styles_builder.py
View File

@@ -332,7 +332,7 @@ class StylesBuilder:
"visibility", valid_values=list(VALID_VISIBILITY), context="css"
)
def process_opacity(self, name: str, tokens: list[Token]) -> None:
def process_text_opacity(self, name: str, tokens: list[Token]) -> None:
if not tokens:
return
token = tokens[0]
@@ -342,16 +342,17 @@ class StylesBuilder:
else:
token_name = token.name
value = token.value
rule_name = name.replace("-", "_")
if token_name == "scalar" and value.endswith("%"):
try:
opacity = percentage_string_to_float(value)
self.styles.set_rule(name, opacity)
text_opacity = percentage_string_to_float(value)
self.styles.set_rule(rule_name, text_opacity)
except ValueError:
error = True
elif token_name == "number":
try:
opacity = clamp(float(value), 0, 1)
self.styles.set_rule(name, opacity)
text_opacity = clamp(float(value), 0, 1)
self.styles.set_rule(rule_name, text_opacity)
except ValueError:
error = True
else:

6
src/textual/css/styles.py
View File

@@ -87,7 +87,7 @@ class RulesMap(TypedDict, total=False):
background: Color
text_style: Style
opacity: float
text_opacity: float
padding: Spacing
margin: Spacing
@@ -184,7 +184,7 @@ class StylesBase(ABC):
"max_height",
"color",
"background",
"opacity",
"text_opacity",
"tint",
"scrollbar_color",
"scrollbar_color_hover",
@@ -204,7 +204,7 @@ class StylesBase(ABC):
background = ColorProperty(Color(0, 0, 0, 0), background=True)
text_style = StyleFlagsProperty()
opacity = FractionalProperty()
text_opacity = FractionalProperty()
padding = SpacingProperty()
margin = SpacingProperty()

2
src/textual/widgets/_header.py
View File

@@ -35,7 +35,7 @@ class HeaderClock(Widget):
padding: 0 1;
background: $secondary-background-lighten-1;
color: $text-secondary-background;
opacity: 85%;
text-opacity: 85%;
content-align: center middle;
}
"""

6
tests/css/test_parse.py
View File

@@ -1098,15 +1098,15 @@ class TestParseOpacity:
],
)
def test_opacity_to_styles(self, css_value, styles_value):
css = f"#some-widget {{ opacity: {css_value} }}"
css = f"#some-widget {{ text-opacity: {css_value} }}"
stylesheet = Stylesheet()
stylesheet.add_source(css)
assert stylesheet.rules[0].styles.opacity == styles_value
assert stylesheet.rules[0].styles.text_opacity == styles_value
assert not stylesheet.rules[0].errors
def test_opacity_invalid_value(self):
css = "#some-widget { opacity: 123x }"
css = "#some-widget { text-opacity: 123x }"
stylesheet = Stylesheet()
with pytest.raises(StylesheetParseError):

8
tests/css/test_styles.py
View File

@@ -120,7 +120,7 @@ def test_render_styles_border():
def test_get_opacity_default():
styles = RenderStyles(DOMNode(), Styles(), Styles())
assert styles.opacity == 1.0
assert styles.text_opacity == 1.0
@pytest.mark.parametrize(
@@ -136,14 +136,14 @@ def test_get_opacity_default():
)
def test_opacity_set_then_get(set_value, expected):
styles = RenderStyles(DOMNode(), Styles(), Styles())
styles.opacity = set_value
assert styles.opacity == expected
styles.text_opacity = set_value
assert styles.text_opacity == expected
def test_opacity_set_invalid_type_error():
styles = RenderStyles(DOMNode(), Styles(), Styles())
with pytest.raises(StyleValueError):
styles.opacity = "invalid value"
styles.text_opacity = "invalid value"
@pytest.mark.parametrize(