Auto Offset Grid

This commit is contained in:
2024-02-25 14:26:35 +01:00
parent 0627fa71be
commit ce7c59a162
5 changed files with 30 additions and 57 deletions

View File

@ -1,26 +1,5 @@
#include "scene.hpp"
void ColorThemeSample() {
RD7::ColorNew(RD7Color_Text, RD7::Color::Hex("#000000", 255));
RD7::ColorNew(RD7Color_TextDisabled, RD7::Color::Hex("#212121", 200));
RD7::ColorNew(RD7Color_Text2, RD7::Color::Hex("#ffffff", 255));
RD7::ColorNew(RD7Color_Background, RD7::Color::Hex("#eeeeee", 170));
RD7::ColorNew(RD7Color_Header, RD7::Color::Hex("#222222", 190));
RD7::ColorNew(RD7Color_Selector, RD7::Color::Hex("#4444dd", 200));
RD7::ColorNew(RD7Color_SelectorFade, RD7::Color::Hex("#7777dd", 200));
RD7::ColorNew(RD7Color_List0, RD7::Color::Hex("#555555", 130));
RD7::ColorNew(RD7Color_List1, RD7::Color::Hex("#777777", 130));
RD7::ColorNew(RD7Color_MessageBackground, RD7::Color::Hex("#222222", 180));
RD7::ColorNew(RD7Color_Button, RD7::Color::Hex("#4444dd", 150));
RD7::ColorNew(RD7Color_ButtonHovered, RD7::Color::Hex("#6666dd", 150));
RD7::ColorNew(RD7Color_ButtonDisabled, RD7::Color::Hex("#2222dd", 150));
RD7::ColorNew(RD7Color_ButtonActive, RD7::Color::Hex("#7777dd", 150));
RD7::ColorNew(RD7Color_Checkmark, RD7::Color::Hex("#4444dd", 130));
RD7::ColorNew(RD7Color_FrameBg, RD7::Color::Hex("#555555", 160));
RD7::ColorNew(RD7Color_FrameBgHovered, RD7::Color::Hex("#777777", 160));
RD7::ColorNew(RD7Color_Progressbar, RD7::Color::Hex("#4444dd", 200));
}
extern void IdbServer();
int main() {
@ -30,7 +9,6 @@ int main() {
RD7::Init::Main("rd7tf");
RD7::FadeIn();
// IdbServer();
ColorThemeSample();
RD7::Init::NdspFirm();
RD7::Scene::Load(std::make_unique<Sample>());
RD7::Ftrace::End("app", "app_init");

View File

@ -51,10 +51,7 @@ void DrawWave(R7Vec2 position, R7Vec2 size, float time, bool dbg) {
R7Vec2 testv2 = R7Vec2(48, 48);
std::vector<int*> img;
R7Vec2 display_icon(void* v, R7Vec2 p) {
DV2::RFS(p, testv2, 0xff00ffff);
return testv2;
}
void display_icon(void* v, R7Vec2 p) { DV2::RFS(p, testv2, 0xff00ffff); }
Sample::Sample() {
auto t = RD7::FileSystem::GetDirContent("sdmc:/music/");
@ -98,8 +95,8 @@ void Sample::Draw() const {
UI7::RestoreCursor();
if (state == State_Menu) {
UI7::Label("SZS: " + std::to_string(img.size()));
UI7::Grid("Images", R7Vec2(390, 180), display_icon, (void**)&img[0],
img.size());
UI7::Grid("Images", R7Vec2(390, 180), testv2, display_icon,
(void**)&img[0], img.size());
}
UI7::EndMenu();
}
@ -124,9 +121,9 @@ void Sample::Draw() const {
UI7::SameLine();
if (UI7::Button("def")) txt_size = 0.5;
UI7::Label("GridControl: ");
if(UI7::Button("icn++")) testv2 += R7Vec2(1, 1);
if (UI7::Button("icn++")) testv2 += R7Vec2(1, 1);
UI7::SameLine();
if(UI7::Button("icn--")) testv2 -= R7Vec2(1, 1);
if (UI7::Button("icn--")) testv2 -= R7Vec2(1, 1);
}
UI7::EndMenu();
}