Browse Source

Fix warning and update X11 shell

Michael Ragazzon 5 years ago
parent
commit
43ef442022
2 changed files with 11 additions and 8 deletions
  1. 4 1
      Samples/shell/src/x11/ShellX11.cpp
  2. 7 7
      Source/Core/PropertyParserAnimation.cpp

+ 4 - 1
Samples/shell/src/x11/ShellX11.cpp

@@ -69,7 +69,8 @@ static bool isRegularFile(const Rml::String& path)
 bool Shell::Initialise()
 bool Shell::Initialise()
 {
 {
 	gettimeofday(&start_time, nullptr);
 	gettimeofday(&start_time, nullptr);
-	InputX11::Initialise();
+	if (!InputX11::Initialise())
+		return false;
 
 
 	Rml::String root = FindSamplesRoot();
 	Rml::String root = FindSamplesRoot();
 	bool result = !root.empty();
 	bool result = !root.empty();
@@ -120,6 +121,8 @@ Rml::String Shell::FindSamplesRoot()
 		}
 		}
 	}
 	}
 
 
+	printf("Unable to find the path to the samples root!\n");
+
 	return Rml::String();
 	return Rml::String();
 }
 }
 
 

+ 7 - 7
Source/Core/PropertyParserAnimation.cpp

@@ -234,7 +234,7 @@ static bool ParseTransition(Property & property, const StringList& transition_va
 	{
 	{
 
 
 		Transition transition;
 		Transition transition;
-		PropertyIdSet target_property_names;
+		PropertyIdSet target_property_ids;
 
 
 		StringList arguments;
 		StringList arguments;
 		StringUtilities::ExpandString(arguments, single_transition_value, ' ');
 		StringUtilities::ExpandString(arguments, single_transition_value, ' ');
@@ -314,12 +314,12 @@ static bool ParseTransition(Property & property, const StringList& transition_va
 					if (auto shorthand = StyleSheetSpecification::GetShorthand(argument))
 					if (auto shorthand = StyleSheetSpecification::GetShorthand(argument))
 					{
 					{
 						PropertyIdSet underlying_properties = StyleSheetSpecification::GetShorthandUnderlyingProperties(shorthand->id);
 						PropertyIdSet underlying_properties = StyleSheetSpecification::GetShorthandUnderlyingProperties(shorthand->id);
-						target_property_names |= underlying_properties;
+						target_property_ids |= underlying_properties;
 					}
 					}
 					else if (auto definition = StyleSheetSpecification::GetProperty(argument))
 					else if (auto definition = StyleSheetSpecification::GetProperty(argument))
 					{
 					{
 						// Single property
 						// Single property
-						target_property_names.Insert(definition->GetId());
+						target_property_ids.Insert(definition->GetId());
 					}
 					}
 					else
 					else
 					{
 					{
@@ -331,15 +331,15 @@ static bool ParseTransition(Property & property, const StringList& transition_va
 		}
 		}
 
 
 		// Validate the parsed transition
 		// Validate the parsed transition
-		if (target_property_names.Empty() || transition.duration <= 0.0f || transition.reverse_adjustment_factor < 0.0f || transition.reverse_adjustment_factor > 1.0f
-			|| (transition_list.all && target_property_names.Size() != 1))
+		if (target_property_ids.Empty() || transition.duration <= 0.0f || transition.reverse_adjustment_factor < 0.0f || transition.reverse_adjustment_factor > 1.0f
+			|| (transition_list.all && target_property_ids.Size() != 1))
 		{
 		{
 			return false;
 			return false;
 		}
 		}
 
 
-		for (const auto& property_name : target_property_names)
+		for (const PropertyId id : target_property_ids)
 		{
 		{
-			transition.id = property_name;
+			transition.id = id;
 			transition_list.transitions.push_back(transition);
 			transition_list.transitions.push_back(transition);
 		}
 		}
 	}
 	}