Ark/pumpbin
1
0
Fork 0
mirror of https://github.com/pumpbin/pumpbin synced 2026-03-14 23:04:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: font family name

Browse Source
This commit is contained in:
b1n
2024-06-25 00:21:51 +08:00
parent 39f677e089
commit 653ac1d8a2
3 changed files with 103 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/maker.rs
View File

@@ -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),

17
src/lib.rs
View File

@@ -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),