qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2025-04-21 12:27:27 +03:00
Code Activity

Merge branch 'master' of projects.qi-hardware.com:gmenu2x into install_locations

Browse Source 
Conflicts:
	data/platform/nanonote/sections/terminals/ash
	src/gmenu2x.cpp
	src/surface.cpp
This commit is contained in:
Ayla
2011-06-02 12:16:26 +02:00
parent b646c33080 5b6d922f11
commit ef4b012026
38 changed files with 509 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/surfacecollection.h
View File

@@ -33,13 +33,8 @@ Hash Map of surfaces that loads surfaces not already loaded and reuses already l
@author Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
*/
class SurfaceCollection {
private:
SurfaceHash surfaces;
std::string skin;
public:
SurfaceCollection(
bool defaultAlpha = true, const std::string &skin = "default");
SurfaceCollection();
~SurfaceCollection();
void setSkin(const std::string &skin);
@@ -51,8 +46,8 @@ public:
void debug();
Surface *add(Surface *s, const std::string &path);
Surface *add(const std::string &path, bool alpha=true);
Surface *addSkinRes(const std::string &path, bool alpha=true);
Surface *add(const std::string &path);
Surface *addSkinRes(const std::string &path);
void del(const std::string &path);
void clear();
void move(const std::string &from, const std::string &to);
@@ -60,6 +55,10 @@ public:
Surface *operator[](const std::string &);
Surface *skinRes(const std::string &);
private:
SurfaceHash surfaces;
std::string skin;
};
#endif