16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-17 23:39:18 +02:00

Merge branch 'master' into master

This commit is contained in:
Ryba04
2025-09-13 19:46:26 +02:00
committed by GitHub
36 changed files with 767 additions and 678 deletions

View File

@@ -6,7 +6,7 @@
#include "widgets/cameraview_extcam.h"
#include "stb/stb_image.h"
#include "Globals.h"
#include "Logs.h"
#include "translation.h"
#include "extras/piped_proc.h"
ui::cameraview_panel::cameraview_panel()

View File

@@ -1,12 +1,9 @@
#include "stdafx.h"
#include "widgets/perfgraphs.h"
#include "Timer.h"
#include "translation.h"
perfgraph_panel::perfgraph_panel()
: ui_panel(STR("Performance"), false)
{
}
perfgraph_panel::perfgraph_panel() : ui_panel(STR("Performance"), false) {}
void perfgraph_panel::render_contents() {
if (ImGui::BeginCombo(STR_C("Timer"), timer_label[current_timer].c_str())) // The second parameter is the label previewed before opening the combo.