Merge branch 'main' of github.com:simul/Platform

simul · Aug 23, 2024 · 0e6e37f · 0e6e37f
2 parents e0c7c55 + f7fe9c3
commit 0e6e37f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/CrossPlatform/TextInputOutput.cpp b/CrossPlatform/TextInputOutput.cpp
@@ -157,12 +157,12 @@ static void LoadArray(TextInput::Array &array,const string &text,platform::core:
 		std::string sub=text.substr(start_pos,end_pos+1-start_pos);
 		TextFileInput *e=::new(m) TextFileInput;
 		array.push_back(e);
-		e->Load(sub);
+		e->LoadText(sub);
 		pos=end_pos;
 	}
 }
 
-void TextFileInput::Load(const std::string &text)
+void TextFileInput::LoadText(const std::string &text)
 {
 	// if there are multiple elements we expect to see { and } at the start and end.
 	size_t open_pos=text.find("{");
@@ -193,7 +193,7 @@ void TextFileInput::Load(const std::string &text)
 		{
 			size_t end_brace_pos=(size_t)findMatchingBrace(text,(int)brace_pos);
 			std::string sub=text.substr(brace_pos,end_brace_pos+1-brace_pos);
-			subElements[name].Load(sub);
+			subElements[name].LoadText(sub);
 			pos=end_brace_pos;
 		}
 		else if(next_ret<text.length())
@@ -213,7 +213,7 @@ void TextFileInput::SetFileLoader(platform::core::FileLoader *f)
 	fileLoader=f;
 }
 
-void TextFileInput::Load(const char *filename_utf8)
+void TextFileInput::LoadFile(const char *filename_utf8)
 {
 	if(!filename_utf8)
 		return;
@@ -255,7 +255,7 @@ void TextFileInput::Load(const char *filename_utf8)
 			text+="\r\n";
 		}
 	}
-	Load(text);
+	LoadText(text);
 	good=true;
 }
 

diff --git a/CrossPlatform/TextInputOutput.h b/CrossPlatform/TextInputOutput.h
@@ -124,8 +124,8 @@ namespace platform
 			TextFileInput(platform::core::MemoryInterface *m=NULL);
 			virtual ~TextFileInput();
 			void SetFileLoader(platform::core::FileLoader *f);
-			void Load(const char *filename);
-			void Load(const std::string &text);
+			void LoadFile(const char *filename);
+			void LoadText(const std::string &text);
 			bool Good();
 			//! Is the specified element in the list?
 			virtual bool Has(const char *name) const;

diff --git a/Docs/platform_sphinx_theme/static/css/theme.css b/Docs/platform_sphinx_theme/static/css/theme.css
@@ -5359,15 +5359,15 @@ input[type=checkbox][disabled], input[type=radio][disabled]
 }
 
 .wy-table-responsive table td:nth-child(1), .wy-table-responsive table th:nth-child(1) {
-    width: 20%; 
+    width: 25%; 
 }
 
 .wy-table-responsive table td:nth-child(2), .wy-table-responsive table th:nth-child(2) {
-    width: 60%; 
+    width: 50%; 
 }
 
 .wy-table-responsive table td:nth-child(3), .wy-table-responsive table th:nth-child(3) {
-    width: 20%;
+    width: 25%;
 }
 
 a