diff options
| author | Didier Raboud <odyx@debian.org> | 2014-07-02 11:33:47 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2014-07-02 11:33:47 +0200 |
| commit | 2e136acd34c45e5e6d105cabf91c67e5865c38fe (patch) | |
| tree | 8561603160cce0b41ba31250539a22d37a2951de /test/unit/ui/mocks/text_mock.h | |
| parent | 562be6fe765d7742f7c38fbd82f8cc26369e238b (diff) | |
| parent | d9fee8b2adad613cf8c10d153cd5cd7b261b7863 (diff) | |
| download | colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.tar.gz colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.tar.bz2 colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.zip | |
Merge tag 'colobot-gold-0.1.3-alpha' into debian
Diffstat (limited to 'test/unit/ui/mocks/text_mock.h')
| -rw-r--r-- | test/unit/ui/mocks/text_mock.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/test/unit/ui/mocks/text_mock.h b/test/unit/ui/mocks/text_mock.h index f38b977..b9af6d3 100644 --- a/test/unit/ui/mocks/text_mock.h +++ b/test/unit/ui/mocks/text_mock.h @@ -15,11 +15,21 @@ public: { }; - MOCK_METHOD4(GetCharWidth, float(Gfx::UTF8Char, Gfx::FontType, float, float)); + MOCK_METHOD4(GetCharWidth, float(Gfx::UTF8Char ch, + Gfx::FontType type, + float size, + float offset)); MOCK_METHOD4(GetStringWidth, float(const std::string &text, std::vector<Gfx::FontMetaChar>::iterator format, - std::vector<Gfx::FontMetaChar>::iterator end, float size)); - MOCK_METHOD3(GetStringWidth, float(const std::string &, Gfx::FontType, float)); + std::vector<Gfx::FontMetaChar>::iterator end, + float size)); + MOCK_METHOD3(GetStringWidth, float(std::string text, + Gfx::FontType font, + float size)); + MOCK_METHOD4(GetStringWidth, float(Gfx::UTF8Char ch, + Gfx::FontType font, + float size, + float offset)); }; |