Skip to content
Snippets Groups Projects
Commit 79de1d66 authored by sam edelsten's avatar sam edelsten
Browse files

add minimum padding, fixing centered infiniteline

parent 64310920
No related branches found
No related tags found
No related merge requests found
...@@ -148,6 +148,7 @@ pub fn set_x_offset( ...@@ -148,6 +148,7 @@ pub fn set_x_offset(
} }
let padding_x = match position { let padding_x = match position {
// TODO: This 5 should be specified by user
CosmicTextPosition::Center => 5., CosmicTextPosition::Center => 5.,
CosmicTextPosition::TopLeft { padding } => *padding as f32, CosmicTextPosition::TopLeft { padding } => *padding as f32,
CosmicTextPosition::Left { padding } => *padding as f32, CosmicTextPosition::Left { padding } => *padding as f32,
......
...@@ -4,8 +4,8 @@ use image::{imageops::FilterType, GenericImageView}; ...@@ -4,8 +4,8 @@ use image::{imageops::FilterType, GenericImageView};
use crate::{ use crate::{
layout::{CosmicPadding, CosmicWidgetSize}, layout::{CosmicPadding, CosmicWidgetSize},
CosmicBackground, CosmicBuffer, CosmicEditor, CosmicFontSystem, CosmicTextPosition, CosmicBackground, CosmicBuffer, CosmicEditor, CosmicFontSystem, CursorColor, DefaultAttrs,
CursorColor, DefaultAttrs, FillColor, ReadOnly, SelectionColor, XOffset, FillColor, ReadOnly, SelectionColor, XOffset,
}; };
#[derive(Resource)] #[derive(Resource)]
...@@ -77,7 +77,6 @@ pub(crate) fn render_texture( ...@@ -77,7 +77,6 @@ pub(crate) fn render_texture(
&CosmicPadding, &CosmicPadding,
&XOffset, &XOffset,
Option<&ReadOnly>, Option<&ReadOnly>,
&CosmicTextPosition,
)>, )>,
mut font_system: ResMut<CosmicFontSystem>, mut font_system: ResMut<CosmicFontSystem>,
mut images: ResMut<Assets<Image>>, mut images: ResMut<Assets<Image>>,
...@@ -96,7 +95,6 @@ pub(crate) fn render_texture( ...@@ -96,7 +95,6 @@ pub(crate) fn render_texture(
padding, padding,
x_offset, x_offset,
readonly_opt, readonly_opt,
position,
) in query.iter_mut() ) in query.iter_mut()
{ {
// Draw background // Draw background
...@@ -135,11 +133,6 @@ pub(crate) fn render_texture( ...@@ -135,11 +133,6 @@ pub(crate) fn render_texture(
.color_opt .color_opt
.unwrap_or(cosmic_text::Color::rgb(0, 0, 0)); .unwrap_or(cosmic_text::Color::rgb(0, 0, 0));
let x_offset_divisor = match position {
CosmicTextPosition::Center => 2.,
_ => 1.,
};
let draw_closure = |x, y, w, h, color| { let draw_closure = |x, y, w, h, color| {
for row in 0..h as i32 { for row in 0..h as i32 {
for col in 0..w as i32 { for col in 0..w as i32 {
...@@ -147,7 +140,8 @@ pub(crate) fn render_texture( ...@@ -147,7 +140,8 @@ pub(crate) fn render_texture(
&mut pixels, &mut pixels,
size.0.x as i32, size.0.x as i32,
size.0.y as i32, size.0.y as i32,
x + col + padding.x as i32 - (x_offset.left / x_offset_divisor) as i32, // TODO: padding should draw from a user specified minumum here
x + col + padding.x.max(5.) as i32 - x_offset.left as i32,
y + row + padding.y as i32, y + row + padding.y as i32,
color, color,
); );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment