josh/ReJUI
2
0
Fork 0
Code Issues 60 Pull Requests Actions Packages Projects 1 Releases 29 Wiki Activity

Remove NonFree fonts

Browse Source
This commit is contained in:
josh
2024-12-04 15:31:47 -05:00
parent 936c1902d0
commit 2a7b562b8f
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/fonts/FreeSans.ttf
View File

Binary file not shown.

2
include/JUI/Base/TextBase.hpp
View File

@@ -120,7 +120,7 @@ namespace JUI
TextAlign::H h_align = TextAlign::H::Left;
TextAlign::V v_align = TextAlign::V::Top;
TextOverflowMode overflow_mode;
JGL::Font set_font = JGL::Font("assets/fonts/FreeSans.ttf");
JGL::Font set_font = JGL::Font("assets/fonts/Jupiteroid.ttf");
u32 text_size = 12;
};

20
main.cpp
View File

@@ -25,7 +25,7 @@
#include <JUI/Widgets/Checkbox.hpp>
#include <rewindow/types/window.h>
JGL::Font FreeSans;
JGL::Font Jupiteroid;
JUI::Scene* scene;
JGL::Texture* sample_texture;
@@ -36,14 +36,14 @@ JUI::Scene* CreateScene() {
auto* topbar = new UtilityBar(root);
topbar->ZIndex(3);
topbar->SetFont(FreeSans);
topbar->SetFont(Jupiteroid);
auto* file = topbar->AddButton("File");
file->SetTooltip("This Dick Nigga", 0.5f);
file->OnClickEvent += [&, root, file] (Vector2 pos, JUI::MouseButton btn)
{
auto* ctx_menu = new ContextMenu(root);
ctx_menu->SetFont(FreeSans);
ctx_menu->SetFont(Jupiteroid);
ctx_menu->Position(UDim2(0,20,0,0));
ctx_menu->AddItem("A");
ctx_menu->AddItem("B");
@@ -78,7 +78,7 @@ JUI::Scene* CreateScene() {
auto* button = new TextButton(s1_vert);
//button->Position({5, 105, 0, 0});
button->Size({0, 35, 1, 0});
button->SetFont(FreeSans);
button->SetFont(Jupiteroid);
button->SetTextColor(Colors::Black);
button->SetContent("Button");
button->AlignLeft();
@@ -87,7 +87,7 @@ JUI::Scene* CreateScene() {
auto* button2 = new TextButton(s1_vert);
//button2->Position({5, 105, 0, 0});
button2->Size({0, 35, 1, 0});
button2->SetFont(FreeSans);
button2->SetFont(Jupiteroid);
button2->SetTextColor(Colors::Black);
button2->SetContent("Button");
button2->AlignCenterHorizontally();
@@ -95,7 +95,7 @@ JUI::Scene* CreateScene() {
auto* button3 = new TextButton(s1_vert);
//button2->Position({5, 105, 0, 0});
button3->Size({0, 35, 1, 0});
button3->SetFont(FreeSans);
button3->SetFont(Jupiteroid);
button3->SetTextColor(Colors::Black);
button3->SetContent("Button");
button3->AlignRight();
@@ -222,7 +222,7 @@ JUI::Scene* CreateScene() {
*/
// Window //
auto* win_element = new JUI::Window(root);
win_element->SetTitleFont(FreeSans);
win_element->SetTitleFont(Jupiteroid);
win_element->CornerRounding(5);
win_element->Size({50_percent, 50_percent});
win_element->SetTitle("Window Widget");
@@ -240,7 +240,7 @@ JUI::Scene* CreateScene() {
TextRect* a = new TextRect(list);
a->SetTextSize(16);
a->SetFont(FreeSans);
a->SetFont(Jupiteroid);
a->Size({0, 20, 1, 0});
//a->FitText(true);
a->Center();
@@ -253,7 +253,7 @@ JUI::Scene* CreateScene() {
//b->FitText(true);
b->Size({0, 20, 1, 0});
b->Center();
b->SetFont(FreeSans);
b->SetFont(Jupiteroid);
root->SetViewportSize({800, 600});
@@ -349,7 +349,7 @@ int main()
JGL::Update({800, 600});
FreeSans = JGL::Font("assets/fonts/FreeSans.ttf");
Jupiteroid = JGL::Font("assets/fonts/Jupiteroid.ttf");
sample_texture = new JGL::Texture("assets/ld.png");
scene = CreateScene();

2
src/JUI/Widgets/Window.cpp
View File

@@ -64,7 +64,7 @@ namespace JUI
exit_btn->BorderColors({0,0,0,0}, {0,0,0,0}, {0,0,0,0}, {0,0,0,0});
exit_btn->BorderColor({0,0,0,0});
exit_btn->SetBorderWidth(0.f);
//JGL::Font FreeSans
//exit_btn_text->SetFont(TitleLabel->GetFont());
exit_btn->SetTextSize(title_font_size);
exit_btn->SetTextColor({255, 0, 0});