Compare commits
	
		
			4 Commits
		
	
	
		
			d68e64931b
			...
			6b53eaf6b1
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 6b53eaf6b1 | |||
| 16c32273ac | |||
| 1567a6e29d | |||
| 89d543bcbc | 
							
								
								
									
										4
									
								
								deps/ox/src/ox/std/string.hpp
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								deps/ox/src/ox/std/string.hpp
									
									
									
									
										vendored
									
									
								
							@@ -392,7 +392,7 @@ template<std::size_t SmallStringSize_v>
 | 
				
			|||||||
constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(const char *str) const noexcept {
 | 
					constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(const char *str) const noexcept {
 | 
				
			||||||
	const std::size_t strLen = ox::strlen(str);
 | 
						const std::size_t strLen = ox::strlen(str);
 | 
				
			||||||
	const auto currentLen = len();
 | 
						const auto currentLen = len();
 | 
				
			||||||
	BasicString<SmallStringSize_v> cpy(currentLen + strLen);
 | 
						BasicString<SmallStringSize_v> cpy;
 | 
				
			||||||
	cpy.m_buff.resize(m_buff.size() + strLen);
 | 
						cpy.m_buff.resize(m_buff.size() + strLen);
 | 
				
			||||||
	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
 | 
						ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
 | 
				
			||||||
	ox::listcpy(&cpy.m_buff[currentLen], str, strLen);
 | 
						ox::listcpy(&cpy.m_buff[currentLen], str, strLen);
 | 
				
			||||||
@@ -423,7 +423,7 @@ constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operato
 | 
				
			|||||||
	const std::size_t strLen = src.len();
 | 
						const std::size_t strLen = src.len();
 | 
				
			||||||
	const auto currentLen = len();
 | 
						const auto currentLen = len();
 | 
				
			||||||
	BasicString<SmallStringSize_v> cpy(currentLen + strLen);
 | 
						BasicString<SmallStringSize_v> cpy(currentLen + strLen);
 | 
				
			||||||
	cpy.m_buff.resize(m_buff.size() + strLen + 1);
 | 
						cpy.m_buff.resize(m_buff.size() + strLen);
 | 
				
			||||||
	ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
 | 
						ox::listcpy(&cpy.m_buff[0], m_buff.data(), currentLen);
 | 
				
			||||||
	ox::listcpy(&cpy.m_buff[currentLen], src.data(), strLen);
 | 
						ox::listcpy(&cpy.m_buff[currentLen], src.data(), strLen);
 | 
				
			||||||
	cpy.m_buff[cpy.m_buff.size() - 1] = 0;
 | 
						cpy.m_buff[cpy.m_buff.size() - 1] = 0;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -445,7 +445,7 @@ void TileSheetEditorImGui::drawPaletteMenu() noexcept {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	if (ig::DragDropTarget const dragDropTarget; dragDropTarget) {
 | 
						if (ig::DragDropTarget const dragDropTarget; dragDropTarget) {
 | 
				
			||||||
		auto const [ref, err] = ig::getDragDropPayload<studio::FileRef>("FileRef");
 | 
							auto const [ref, err] = ig::getDragDropPayload<studio::FileRef>("FileRef");
 | 
				
			||||||
		if (!err) {
 | 
							if (!err && endsWith(ref.path, FileExt_npal)) {
 | 
				
			||||||
			auto const oldVal = m_selectedPaletteIdx;
 | 
								auto const oldVal = m_selectedPaletteIdx;
 | 
				
			||||||
			std::ignore = ox::findIdx(files.begin(), files.end(), ref.path).moveTo(m_selectedPaletteIdx);
 | 
								std::ignore = ox::findIdx(files.begin(), files.end(), ref.path).moveTo(m_selectedPaletteIdx);
 | 
				
			||||||
			if (oldVal != m_selectedPaletteIdx) {
 | 
								if (oldVal != m_selectedPaletteIdx) {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user