Merge commit 'e723ead864edb4bc160e4d69713309174ad9e82e'
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				Build / build (push) Successful in 1m34s
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	Build / build (push) Successful in 1m34s
				
			This commit is contained in:
		@@ -642,7 +642,7 @@ void TileSheetEditorImGui::ExportMenu::draw(turbine::Context &tctx) noexcept {
 | 
				
			|||||||
	constexpr auto popupSz = ImVec2{popupWidth, popupHeight};
 | 
						constexpr auto popupSz = ImVec2{popupWidth, popupHeight};
 | 
				
			||||||
	if (ig::BeginPopup(tctx, popupName, m_show, popupSz)) {
 | 
						if (ig::BeginPopup(tctx, popupName, m_show, popupSz)) {
 | 
				
			||||||
		ImGui::InputInt("Scale", &m_scale);
 | 
							ImGui::InputInt("Scale", &m_scale);
 | 
				
			||||||
		m_scale = ox::clamp(m_scale, 1, 50);
 | 
							m_scale = ox::clamp(m_scale, 1, 135);
 | 
				
			||||||
		if (ig::PopupControlsOkCancel(popupWidth, m_show) == ig::PopupResponse::OK) {
 | 
							if (ig::PopupControlsOkCancel(popupWidth, m_show) == ig::PopupResponse::OK) {
 | 
				
			||||||
			inputSubmitted.emit(m_scale);
 | 
								inputSubmitted.emit(m_scale);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,17 +1,17 @@
 | 
				
			|||||||
add_library(
 | 
					add_library(
 | 
				
			||||||
	StudioAppLib
 | 
						StudioAppLib
 | 
				
			||||||
		aboutpopup.cpp
 | 
							aboutpopup.cpp
 | 
				
			||||||
 | 
							app.cpp
 | 
				
			||||||
		clawviewer.cpp
 | 
							clawviewer.cpp
 | 
				
			||||||
		deleteconfirmation.cpp
 | 
							deleteconfirmation.cpp
 | 
				
			||||||
		filedialogmanager.cpp
 | 
							filedialogmanager.cpp
 | 
				
			||||||
		main.cpp
 | 
					 | 
				
			||||||
		makecopypopup.cpp
 | 
							makecopypopup.cpp
 | 
				
			||||||
		newdir.cpp
 | 
							newdir.cpp
 | 
				
			||||||
		newmenu.cpp
 | 
							newmenu.cpp
 | 
				
			||||||
		newproject.cpp
 | 
							newproject.cpp
 | 
				
			||||||
		projectexplorer.cpp
 | 
							projectexplorer.cpp
 | 
				
			||||||
		renamefile.cpp
 | 
							renamefile.cpp
 | 
				
			||||||
		studioapp.cpp
 | 
							studioui.cpp
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
target_compile_definitions(
 | 
					target_compile_definitions(
 | 
				
			||||||
	StudioAppLib PUBLIC
 | 
						StudioAppLib PUBLIC
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,8 +11,7 @@
 | 
				
			|||||||
#include <turbine/turbine.hpp>
 | 
					#include <turbine/turbine.hpp>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <studio/context.hpp>
 | 
					#include <studio/context.hpp>
 | 
				
			||||||
#include <studioapp/studioapp.hpp>
 | 
					#include "studioui.hpp"
 | 
				
			||||||
#include "studioapp.hpp"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace studio {
 | 
					namespace studio {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -14,7 +14,7 @@
 | 
				
			|||||||
#include <studio/configio.hpp>
 | 
					#include <studio/configio.hpp>
 | 
				
			||||||
#include "clawviewer.hpp"
 | 
					#include "clawviewer.hpp"
 | 
				
			||||||
#include "filedialogmanager.hpp"
 | 
					#include "filedialogmanager.hpp"
 | 
				
			||||||
#include "studioapp.hpp"
 | 
					#include "studioui.hpp"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace studio {
 | 
					namespace studio {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		Reference in New Issue
	
	Block a user