SquareGameLiberationFront/jujube
1
0
Fork 0
mirror of synced 2025-02-13 08:52:33 +01:00
Code Releases Activity

Create window according to preferences

Browse Source
This commit is contained in:
Stepland 2020-02-11 23:37:57 +01:00
parent 0cf3815177
commit cea16eee6f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Main.cpp
View File

@ -15,7 +15,14 @@
int main(int argc, char const *argv[]) { int main(int argc, char const *argv[]) {
Data::Preferences preferences; Data::Preferences preferences;
sf::RenderWindow window; sf::RenderWindow window{
sf::VideoMode(
preferences.screen.width,
preferences.screen.height
),
"jujube",
preferences.screen.fullscreen ? sf::Style::Fullscreen : sf::Style::Default
};
Data::SongList song_list; Data::SongList song_list;
MusicSelect::Screen music_select{song_list}; MusicSelect::Screen music_select{song_list};

5
src/Screens/MusicSelect/MusicSelect.cpp
View File

@ -31,14 +31,13 @@ MusicSelect::Screen::Screen(const Data::SongList& t_song_list) :
} }
void MusicSelect::Screen::select_chart(sf::RenderWindow& window) { void MusicSelect::Screen::select_chart(sf::RenderWindow& window) {
window.create(sf::VideoMode(768, 1360), "jujube", sf::Style::Titlebar);
window.setFramerateLimit(60); window.setFramerateLimit(60);
ImGui::SFML::Init(window); ImGui::SFML::Init(window);
bool chart_selected = false; bool chart_selected = false;
sf::Clock imguiClock; sf::Clock imguiClock;
ribbon.setPosition(8.f, 602.f); ribbon.setPosition(8.f, 602.f);
button_highlight.setPosition(8.f, 602.f); button_highlight.setPosition(8.f, 602.f);
while (not chart_selected) { while ((not chart_selected) and window.isOpen()) {
sf::Event event; sf::Event event;
while (window.pollEvent(event)) { while (window.pollEvent(event)) {
ImGui::SFML::ProcessEvent(event); ImGui::SFML::ProcessEvent(event);
@ -48,6 +47,8 @@ void MusicSelect::Screen::select_chart(sf::RenderWindow& window) {
break; break;
case sf::Event::MouseButtonPressed: case sf::Event::MouseButtonPressed:
handle_mouse_click(event.mouseButton); handle_mouse_click(event.mouseButton);
case sf::Event::Closed:
window.close();
default: default:
break; break;
} }