Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ if(NOT DEFINED TGUI_SHARED_LIBS)
if(NOT DEFINED BUILD_SHARED_LIBS AND (CMAKE_VERSION VERSION_LESS 3.21 OR PROJECT_IS_TOP_LEVEL) AND NOT TGUI_OS_EMSCRIPTEN)
option(BUILD_SHARED_LIBS "ON to build a shared (dynamic) library, OFF to build a static library" ON)
elseif(TGUI_OS_ANDROID AND NOT DEFINED BUILD_SHARED_LIBS)
# For backwards compatiblity we will default to a shared library on Android without asking
# For backwards compatibility we will default to a shared library on Android without asking
set(BUILD_SHARED_LIBS ON)
elseif(TGUI_OS_EMSCRIPTEN)
# Emscripten does not support shared libraries
Expand Down
2 changes: 1 addition & 1 deletion doc/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{% include footer.ext %}
<{{""}}!{{""}}-{{""}}- -->

<!-- Show the class list by default instead of requiring the user to manually exapand the namespace first -->
<!-- Show the class list by default instead of requiring the user to manually expand the namespace first -->
<script type="text/javascript">
if(window.location.href.endsWith('/namespaces.html') || window.location.href.endsWith('/namespaces') || window.location.href.endsWith('/annotated.html') || window.location.href.endsWith('/annotated'))
{
Expand Down
2 changes: 1 addition & 1 deletion include/TGUI/Loading/Theme.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ namespace tgui
///
/// @param property Name of the global property to retrieve
///
/// @return Value of the global property, or an object with type ObjectConverter::Type::None if no such propery exists
/// @return Value of the global property, or an object with type ObjectConverter::Type::None if no such property exists
////////////////////////////////////////////////////////////////////////////////////////////////////////////////
[[nodiscard]] ObjectConverter getGlobalProperty(const String& property);

Expand Down
2 changes: 1 addition & 1 deletion include/TGUI/Widgets/Scrollbar.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ namespace tgui
///
/// @param size The new size of the scrollbar
///
/// Note that the Orientation propery is changed by this function based on the given width and height,
/// Note that the Orientation property is changed by this function based on the given width and height,
/// unless the setOrientation function was previously called to explicitly select the orientation.
////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void setSize(const Layout2d& size) override;
Expand Down
2 changes: 1 addition & 1 deletion include/TGUI/Widgets/Slider.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ namespace tgui
///
/// @param size The new size of the slider
///
/// Note that the Orientation propery is changed by this function based on the given width and height,
/// Note that the Orientation property is changed by this function based on the given width and height,
/// unless the setOrientation function was previously called to explicitly select the orientation.
////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void setSize(const Layout2d& size) override;
Expand Down
2 changes: 1 addition & 1 deletion include/TGUI/Widgets/SpinButton.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ namespace tgui
///
/// @param size The new size of the spin button
///
/// Note that the Orientation propery is changed by this function based on the given width and height,
/// Note that the Orientation property is changed by this function based on the given width and height,
/// unless the setOrientation function was previously called to explicitly select the orientation.
////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void setSize(const Layout2d& size) override;
Expand Down
2 changes: 1 addition & 1 deletion src/Loading/ThemeLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ namespace tgui
for (const auto& widgetType : WidgetFactory::getWidgetTypes())
m_propertiesCache[filename][widgetType] = {};

// Cache all propery value pairs
// Cache all property value pairs
for (const auto& section : sections)
{
const auto& child = section.second;
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/MenuWidgetBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ namespace tgui
continue;

if (!childNode->propertyValuePairs[U"Text"])
throw Exception{U"Failed to parse 'Menu' property, expected a nested 'Text' propery"};
throw Exception{U"Failed to parse 'Menu' property, expected a nested 'Text' property"};

const String menuText = Deserializer::deserialize(ObjectConverter::Type::String,
childNode->propertyValuePairs[U"Text"]->value)
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/TreeView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1396,7 +1396,7 @@ namespace tgui
continue;

if (!childNode->propertyValuePairs[U"Text"])
throw Exception{U"Failed to parse 'Item' property, expected a nested 'Text' propery"};
throw Exception{U"Failed to parse 'Item' property, expected a nested 'Text' property"};

const String itemText = Deserializer::deserialize(ObjectConverter::Type::String,
childNode->propertyValuePairs[U"Text"]->value)
Expand Down
Loading