Skip to content

Commit

Permalink
Merge branch 'main' into barebones
Browse files Browse the repository at this point in the history
  • Loading branch information
CaspianA1 committed Sep 1, 2024
2 parents 2cdc46d + 1a4ef20 commit 137020f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/dashboard_defs/credit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ pub fn make_credit_window(top_left: Vec2f, size: Vec2f,
let fields = updatable_text_pattern::UpdatableTextWindowFields {
inner: text,
text_color,
scroll_fn: |seed, _| ((seed * 5.0).sin() * 0.5 + 0.5, false),
scroll_fn: |seed, _| ((seed * 2.0).sin() * 0.5 + 0.5, false),
update_rate: UpdateRate::ALMOST_NEVER,
maybe_border_color: Some(border_color)
};
Expand Down
6 changes: 3 additions & 3 deletions src/dashboard_defs/dashboard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ fn run_command(command: &str, args: &[&str]) -> GenericResult<String> {
.output()?;

if !output.status.success() {
error_msg!("This command failed: {command} {}", args.join(" "))
error_msg!("This command failed: '{command} {}'", args.join(" "))
}
else {
String::from_utf8(output.stdout).to_generic().and_then(|s| Ok(s.trim().to_owned()))
Expand Down Expand Up @@ -261,8 +261,8 @@ pub fn make_dashboard(
let credit_message = format!("By Caspian Ahlberg, release #{num_commits}, on branch '{branch_name}'");

let credit_window = make_credit_window(
Vec2f::new(0.8, 0.98),
Vec2f::new(0.2, 0.02),
Vec2f::new(0.8, 0.97),
Vec2f::new(0.2, 0.03),
credit_border_and_text_color,
credit_border_and_text_color,
credit_message
Expand Down

0 comments on commit 137020f

Please sign in to comment.