From 653ac1d8a24178769e261713335a3597b0404a0f Mon Sep 17 00:00:00 2001 From: b1n Date: Tue, 25 Jun 2024 00:21:51 +0800 Subject: [PATCH] fix: font family name --- assets/OFL.txt | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ src/bin/maker.rs | 10 +++--- src/lib.rs | 17 ++++----- 3 files changed, 103 insertions(+), 17 deletions(-) create mode 100644 assets/OFL.txt diff --git a/assets/OFL.txt b/assets/OFL.txt new file mode 100644 index 0000000..8bee414 --- /dev/null +++ b/assets/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/bin/maker.rs b/src/bin/maker.rs index 5474b0d..29b4a0b 100644 --- a/src/bin/maker.rs +++ b/src/bin/maker.rs @@ -8,11 +8,11 @@ use iced::{ button, column, horizontal_rule, pick_list, radio, row, svg::Handle, text, text_editor, text_input, Svg, }, - Alignment, Font, Length, Renderer, Task, Theme, + Alignment, Length, Renderer, Task, Theme, }; use pumpbin::{ plugin::{Bins, Plugin}, - svg_style, ShellcodeSaveType, + svg_style, ShellcodeSaveType, FONT, }; use pumpbin::{ plugin::{EncryptType, Platforms}, @@ -531,8 +531,6 @@ impl Application for Maker { } fn view(&self) -> iced::Element<'_, Self::Message, Self::Theme, Self::Renderer> { - let font = Font::with_name("JetBrainsMono Nerd Font"); - let choose_button = || { button( Svg::new(Handle::from_memory(include_bytes!( @@ -544,14 +542,14 @@ impl Application for Maker { let pick_list_handle = || pick_list::Handle::Dynamic { closed: pick_list::Icon { - font, + font: FONT, code_point: '', size: None, line_height: text::LineHeight::Relative(1.0), shaping: text::Shaping::Basic, }, open: pick_list::Icon { - font, + font: FONT, code_point: '', size: None, line_height: text::LineHeight::Relative(1.0), diff --git a/src/lib.rs b/src/lib.rs index 608fcff..d28f5db 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,7 +8,6 @@ use dirs::{desktop_dir, home_dir}; use iced::{ advanced::Application, executor, - font::{Family, Stretch, Style, Weight}, widget::{ button, column, container, horizontal_rule, pick_list, row, scrollable, svg::{self, Handle}, @@ -22,6 +21,8 @@ use plugin::{EncryptType, Plugin, Plugins}; use rand::RngCore; use rfd::AsyncFileDialog; +pub const FONT: Font = Font::with_name("JetBrainsMono NFP"); + #[derive(Debug)] pub struct Pumpbin { shellcode_src: String, @@ -80,12 +81,7 @@ impl Pumpbin { ..Default::default() }, fonts: vec![include_bytes!("../assets/JetBrainsMonoNerdFontPropo-Regular.ttf").into()], - default_font: Font { - family: Family::Name("JetBrainsMono Nerd Font"), - weight: Weight::Normal, - stretch: Stretch::Normal, - style: Style::Normal, - }, + default_font: FONT, default_text_size: Pixels(13.0), antialiasing: true, ..Default::default() @@ -725,7 +721,6 @@ impl Application for Pumpbin { fn view(&self) -> iced::Element<'_, Self::Message, Self::Theme, iced::Renderer> { let padding = 20; let spacing = 20; - let font = Font::with_name("JetBrainsMono Nerd Font"); let shellcode_src = row![ text_input( @@ -737,7 +732,7 @@ impl Application for Pumpbin { ) .on_input(Message::ShellcodeSrcChanged) .icon(text_input::Icon { - font, + font: FONT, code_point: '󱓞', size: None, spacing: 12.0, @@ -757,14 +752,14 @@ impl Application for Pumpbin { let pick_list_handle = || pick_list::Handle::Dynamic { closed: pick_list::Icon { - font, + font: FONT, code_point: '', size: None, line_height: text::LineHeight::Relative(1.0), shaping: text::Shaping::Basic, }, open: pick_list::Icon { - font, + font: FONT, code_point: '', size: None, line_height: text::LineHeight::Relative(1.0),