Skip to content

Commit 1e0b9c7

Browse files
committed
Deploying to gh-pages from @ vizia/vizia@42c89df 🚀
1 parent 8c528c1 commit 1e0b9c7

23 files changed

+1355
-1344
lines changed

search-index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

search.desc/vizia/vizia-desc-0-.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

search.desc/vizia_core/vizia_core-desc-0-.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

search.desc/vizia_core/vizia_core-desc-1-.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/vizia_core/animation/interpolator.rs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
<a href=#339 id=339 data-nosnippet>339</a>
340340
<a href=#340 id=340 data-nosnippet>340</a><span class="kw">impl </span>Interpolator <span class="kw">for </span>FontSize {
341341
<a href=#341 id=341 data-nosnippet>341</a> <span class="kw">fn </span>interpolate(start: <span class="kw-2">&amp;</span><span class="self">Self</span>, end: <span class="kw-2">&amp;</span><span class="self">Self</span>, t: f32) -&gt; <span class="self">Self </span>{
342-
<a href=#342 id=342 data-nosnippet>342</a> FontSize(f32::interpolate(<span class="kw-2">&amp;</span>start.<span class="number">0</span>, <span class="kw-2">&amp;</span>end.<span class="number">0</span>, t))
342+
<a href=#342 id=342 data-nosnippet>342</a> FontSize(Length::interpolate(<span class="kw-2">&amp;</span>start.<span class="number">0</span>, <span class="kw-2">&amp;</span>end.<span class="number">0</span>, t))
343343
<a href=#343 id=343 data-nosnippet>343</a> }
344344
<a href=#344 id=344 data-nosnippet>344</a>}
345345
<a href=#345 id=345 data-nosnippet>345</a>

src/vizia_core/context/draw.rs.html

Lines changed: 893 additions & 888 deletions
Large diffs are not rendered by default.

src/vizia_core/context/event.rs.html

Lines changed: 262 additions & 257 deletions
Large diffs are not rendered by default.

src/vizia_core/style/mod.rs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@
596596
<a href=#596 id=596 data-nosnippet>596</a> }
597597
<a href=#597 id=597 data-nosnippet>597</a>
598598
<a href=#598 id=598 data-nosnippet>598</a> Property::FontSize(value) =&gt; {
599-
<a href=#599 id=599 data-nosnippet>599</a> insert_keyframe(<span class="kw-2">&amp;mut </span><span class="self">self</span>.font_size, animation_id, time, <span class="kw-2">*</span>value);
599+
<a href=#599 id=599 data-nosnippet>599</a> insert_keyframe(<span class="kw-2">&amp;mut </span><span class="self">self</span>.font_size, animation_id, time, value.clone());
600600
<a href=#600 id=600 data-nosnippet>600</a> }
601601
<a href=#601 id=601 data-nosnippet>601</a>
602602
<a href=#602 id=602 data-nosnippet>602</a> Property::CaretColor(value) =&gt; {

src/vizia_core/systems/text.rs.html

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -265,44 +265,45 @@
265265
<a href=#265 id=265 data-nosnippet>265</a> }
266266
<a href=#266 id=266 data-nosnippet>266</a>
267267
<a href=#267 id=267 data-nosnippet>267</a> <span class="comment">// Font Size
268-
<a href=#268 id=268 data-nosnippet>268</a> </span><span class="kw">let </span>font_size = style.font_size.get(entity).map_or(<span class="number">16.0</span>, |f| f.<span class="number">0</span>);
269-
<a href=#269 id=269 data-nosnippet>269</a> text_style.set_font_size(font_size * style.scale_factor());
270-
<a href=#270 id=270 data-nosnippet>270</a>
271-
<a href=#271 id=271 data-nosnippet>271</a> <span class="comment">// Font Style
272-
<a href=#272 id=272 data-nosnippet>272</a> </span><span class="kw">match </span>(
273-
<a href=#273 id=273 data-nosnippet>273</a> style.font_weight.get(entity),
274-
<a href=#274 id=274 data-nosnippet>274</a> style.font_width.get(entity),
275-
<a href=#275 id=275 data-nosnippet>275</a> style.font_slant.get(entity),
276-
<a href=#276 id=276 data-nosnippet>276</a> ) {
277-
<a href=#277 id=277 data-nosnippet>277</a> (<span class="prelude-val">None</span>, <span class="prelude-val">None</span>, <span class="prelude-val">None</span>) =&gt; {}
278-
<a href=#278 id=278 data-nosnippet>278</a> (weight, width, slant) =&gt; {
279-
<a href=#279 id=279 data-nosnippet>279</a> text_style.set_font_style(FontStyle::new(
280-
<a href=#280 id=280 data-nosnippet>280</a> weight.copied().unwrap_or_default().into(),
281-
<a href=#281 id=281 data-nosnippet>281</a> width.copied().unwrap_or_default().into(),
282-
<a href=#282 id=282 data-nosnippet>282</a> slant.copied().unwrap_or_default().into(),
283-
<a href=#283 id=283 data-nosnippet>283</a> ));
284-
<a href=#284 id=284 data-nosnippet>284</a> }
285-
<a href=#285 id=285 data-nosnippet>285</a> }
286-
<a href=#286 id=286 data-nosnippet>286</a>
287-
<a href=#287 id=287 data-nosnippet>287</a> <span class="comment">// Font Variations
288-
<a href=#288 id=288 data-nosnippet>288</a> </span><span class="kw">if let </span><span class="prelude-val">Some</span>(coordinates) = style.font_variation_settings.get(entity) {
289-
<a href=#289 id=289 data-nosnippet>289</a> <span class="kw">let </span>coordinates = coordinates.iter().map(|c| c.<span class="number">0</span>).collect::&lt;Vec&lt;<span class="kw">_</span>&gt;&gt;();
290-
<a href=#290 id=290 data-nosnippet>290</a> text_style.set_font_arguments(<span class="kw-2">&amp;</span>FontArguments::new().set_variation_design_position(
291-
<a href=#291 id=291 data-nosnippet>291</a> VariationPosition { coordinates: <span class="kw-2">&amp;</span>coordinates },
292-
<a href=#292 id=292 data-nosnippet>292</a> ));
293-
<a href=#293 id=293 data-nosnippet>293</a> }
294-
<a href=#294 id=294 data-nosnippet>294</a>
295-
<a href=#295 id=295 data-nosnippet>295</a> paragraph_builder.push_style(<span class="kw-2">&amp;</span>text_style);
296-
<a href=#296 id=296 data-nosnippet>296</a> style.text_range.insert(entity, <span class="kw-2">*</span>current..<span class="kw-2">*</span>current + text.len());
297-
<a href=#297 id=297 data-nosnippet>297</a> paragraph_builder.add_text(text.as_str());
298-
<a href=#298 id=298 data-nosnippet>298</a> <span class="kw-2">*</span>current += text.len();
299-
<a href=#299 id=299 data-nosnippet>299</a> }
300-
<a href=#300 id=300 data-nosnippet>300</a> }
301-
<a href=#301 id=301 data-nosnippet>301</a>
302-
<a href=#302 id=302 data-nosnippet>302</a> <span class="kw">let </span>iter = LayoutChildIterator::new(tree, entity);
303-
<a href=#303 id=303 data-nosnippet>303</a> <span class="kw">for </span>child <span class="kw">in </span>iter {
304-
<a href=#304 id=304 data-nosnippet>304</a> <span class="kw">if </span>style.text_span.get(child).copied().unwrap_or_default() {
305-
<a href=#305 id=305 data-nosnippet>305</a> add_block(style, tree, child, paragraph_builder, current);
306-
<a href=#306 id=306 data-nosnippet>306</a> }
307-
<a href=#307 id=307 data-nosnippet>307</a> }
308-
<a href=#308 id=308 data-nosnippet>308</a>}</code></pre></div></section></main></body></html>
268+
<a href=#268 id=268 data-nosnippet>268</a> </span><span class="kw">let </span>font_size =
269+
<a href=#269 id=269 data-nosnippet>269</a> style.font_size.get(entity).map_or(<span class="number">16.0</span>, |f| f.<span class="number">0</span>.to_px().unwrap_or(<span class="number">16.0</span>));
270+
<a href=#270 id=270 data-nosnippet>270</a> text_style.set_font_size(font_size * style.scale_factor());
271+
<a href=#271 id=271 data-nosnippet>271</a>
272+
<a href=#272 id=272 data-nosnippet>272</a> <span class="comment">// Font Style
273+
<a href=#273 id=273 data-nosnippet>273</a> </span><span class="kw">match </span>(
274+
<a href=#274 id=274 data-nosnippet>274</a> style.font_weight.get(entity),
275+
<a href=#275 id=275 data-nosnippet>275</a> style.font_width.get(entity),
276+
<a href=#276 id=276 data-nosnippet>276</a> style.font_slant.get(entity),
277+
<a href=#277 id=277 data-nosnippet>277</a> ) {
278+
<a href=#278 id=278 data-nosnippet>278</a> (<span class="prelude-val">None</span>, <span class="prelude-val">None</span>, <span class="prelude-val">None</span>) =&gt; {}
279+
<a href=#279 id=279 data-nosnippet>279</a> (weight, width, slant) =&gt; {
280+
<a href=#280 id=280 data-nosnippet>280</a> text_style.set_font_style(FontStyle::new(
281+
<a href=#281 id=281 data-nosnippet>281</a> weight.copied().unwrap_or_default().into(),
282+
<a href=#282 id=282 data-nosnippet>282</a> width.copied().unwrap_or_default().into(),
283+
<a href=#283 id=283 data-nosnippet>283</a> slant.copied().unwrap_or_default().into(),
284+
<a href=#284 id=284 data-nosnippet>284</a> ));
285+
<a href=#285 id=285 data-nosnippet>285</a> }
286+
<a href=#286 id=286 data-nosnippet>286</a> }
287+
<a href=#287 id=287 data-nosnippet>287</a>
288+
<a href=#288 id=288 data-nosnippet>288</a> <span class="comment">// Font Variations
289+
<a href=#289 id=289 data-nosnippet>289</a> </span><span class="kw">if let </span><span class="prelude-val">Some</span>(coordinates) = style.font_variation_settings.get(entity) {
290+
<a href=#290 id=290 data-nosnippet>290</a> <span class="kw">let </span>coordinates = coordinates.iter().map(|c| c.<span class="number">0</span>).collect::&lt;Vec&lt;<span class="kw">_</span>&gt;&gt;();
291+
<a href=#291 id=291 data-nosnippet>291</a> text_style.set_font_arguments(<span class="kw-2">&amp;</span>FontArguments::new().set_variation_design_position(
292+
<a href=#292 id=292 data-nosnippet>292</a> VariationPosition { coordinates: <span class="kw-2">&amp;</span>coordinates },
293+
<a href=#293 id=293 data-nosnippet>293</a> ));
294+
<a href=#294 id=294 data-nosnippet>294</a> }
295+
<a href=#295 id=295 data-nosnippet>295</a>
296+
<a href=#296 id=296 data-nosnippet>296</a> paragraph_builder.push_style(<span class="kw-2">&amp;</span>text_style);
297+
<a href=#297 id=297 data-nosnippet>297</a> style.text_range.insert(entity, <span class="kw-2">*</span>current..<span class="kw-2">*</span>current + text.len());
298+
<a href=#298 id=298 data-nosnippet>298</a> paragraph_builder.add_text(text.as_str());
299+
<a href=#299 id=299 data-nosnippet>299</a> <span class="kw-2">*</span>current += text.len();
300+
<a href=#300 id=300 data-nosnippet>300</a> }
301+
<a href=#301 id=301 data-nosnippet>301</a> }
302+
<a href=#302 id=302 data-nosnippet>302</a>
303+
<a href=#303 id=303 data-nosnippet>303</a> <span class="kw">let </span>iter = LayoutChildIterator::new(tree, entity);
304+
<a href=#304 id=304 data-nosnippet>304</a> <span class="kw">for </span>child <span class="kw">in </span>iter {
305+
<a href=#305 id=305 data-nosnippet>305</a> <span class="kw">if </span>style.text_span.get(child).copied().unwrap_or_default() {
306+
<a href=#306 id=306 data-nosnippet>306</a> add_block(style, tree, child, paragraph_builder, current);
307+
<a href=#307 id=307 data-nosnippet>307</a> }
308+
<a href=#308 id=308 data-nosnippet>308</a> }
309+
<a href=#309 id=309 data-nosnippet>309</a>}</code></pre></div></section></main></body></html>

0 commit comments

Comments
 (0)