Skip to content

Commit

Permalink
Added tests for Listview and fixed issues uncovered while writing the…
Browse files Browse the repository at this point in the history 
… tests
  • Loading branch information
@texus
texus committed Jan 27, 2019
1 parent 5afd3e3 commit 07b0af4
Show file tree
Hide file tree
Showing 23 changed files with 984 additions and 96 deletions.
8 changes: 4 additions & 4 deletions .appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
SFML_PATH: C:\SFML-VS2017
SFML_VERSION: master
GENERATOR: Visual Studio 15 2017 Win64
GENERATOR: Visual Studio 15 2017
BUILD_TYPE: Debug
SHARED_LIBS: FALSE
BUILD_TESTS: TRUE
BUILD_EXAMPLES: FALSE
FAST_BUILD: TRUE
BUILD_FOLDER: build-VS2017-Win64
BUILD_FOLDER: build-VS2017-Win32

- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
SFML_PATH: C:\SFML-VS2015
SFML_VERSION: 2.5.0
GENERATOR: Visual Studio 14 2015
GENERATOR: Visual Studio 14 2015 Win64
BUILD_TYPE: Release
SHARED_LIBS: TRUE
BUILD_TESTS: FALSE
BUILD_EXAMPLES: TRUE
FAST_BUILD: FALSE
BUILD_FOLDER: build-VS2015-Win32
BUILD_FOLDER: build-VS2015-Win64

- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
SFML_PATH: C:\SFML
Expand Down
4 changes: 2 additions & 2 deletions include/TGUI/Config.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@
#endif

#ifndef TGUI_NO_RUNTIME_WARNINGS
#define TGUI_PRINT_WARNING(msg) sf::err() << "TGUI Warning: " << msg << std::endl;
#define TGUI_PRINT_WARNING(msg) { sf::err() << "TGUI Warning: " << msg << std::endl; }
#else
#define TGUI_PRINT_WARNING(msg)
#define TGUI_PRINT_WARNING(msg) {}
#endif

#ifdef TGUI_NEXT
Expand Down
81 changes: 61 additions & 20 deletions include/TGUI/Widgets/ListView.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,25 @@ namespace tgui
std::size_t addColumn(const sf::String& text, float width = 0, ColumnAlignment alignment = ColumnAlignment::Left);


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// @brief Changes the text of a column
///
/// @param index Index of the column to change
/// @param text Caption of the column
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void setColumnText(std::size_t index, const sf::String& text);


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// @brief Returns the text of a column
///
/// @param index Index of the column
///
/// @return Caption of the column
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
sf::String getColumnText(std::size_t index);


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// @brief Changes the width of a column
///
Expand All @@ -140,6 +159,35 @@ namespace tgui
void setColumnWidth(std::size_t index, float width);


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// @brief Returns the width of a column
///
/// @param index Index of the column
///
/// @return Width of the column
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
float getColumnWidth(std::size_t index);


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// @brief Changes the text alignment within a column
///
/// @param columnIndex Index of the column to change
/// @param alignment The text alignment for all texts in the column
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void setColumnAlignment(unsigned int columnIndex, ColumnAlignment alignment);


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// @brief Returns the current text alignment within a column
///
/// @param columnIndex Index of the column to inspect
///
/// @return Text alignment for all texts in the column
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
ColumnAlignment getColumnAlignment(unsigned int columnIndex) const;


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// @brief Removes all columns
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -186,25 +234,6 @@ namespace tgui
bool getHeaderVisible() const;


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// @brief Changes the text alignment within a column
///
/// @param columnIndex Index of the column to change
/// @param alignment The text alignment for all texts in the column
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void setColumnAlignment(unsigned int columnIndex, ColumnAlignment alignment);


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// @brief Returns the current text alignment within a column
///
/// @param columnIndex Index of the column to inspect
///
/// @return Text alignment for all texts in the column
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
ColumnAlignment getColumnAlignment(unsigned int columnIndex) const;


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/// @brief Adds an item to the list
///
Expand Down Expand Up @@ -514,11 +543,17 @@ namespace tgui


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Create a Text object from the given caption, using the preset color, font, text size and opacity
// Create a Text object for an item from the given caption, using the preset color, font, text size and opacity
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Text createText(const sf::String& caption);


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Create a Text object for a header text from the given caption, using the preset color, font, text size and opacity
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Text createHeaderText(const sf::String& caption);


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Changes the color of all Text objects in an item
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand All @@ -543,6 +578,12 @@ namespace tgui
void updateItemColors();


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Changes the color of all header texts
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void updateHeaderTextsColor();


/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Update on which item the mouse is standing
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
Loading

0 comments on commit 07b0af4

Please sign in to comment.