• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1821 (tree)
日時2010-05-11 07:10:20
作者satofumi

ログメッセージ

adjusted TextRubiFadeSurface constructor

変更サマリ

差分

--- trunk/libs/lua/luabindGui.cpp (revision 1820)
+++ trunk/libs/lua/luabindGui.cpp (revision 1821)
@@ -17,6 +17,7 @@
1717 #include "Font.h"
1818 #include "TextSurface.h"
1919 #include "TextFadeSurface.h"
20+#include "TextRubiFadeSurface.h"
2021 #include "ColorSurface.h"
2122 #include "FillSurface.h"
2223 #include "ImageSurface.h"
@@ -129,6 +130,13 @@
129130 .def("draw", &TextFadeSurface::draw)
130131 .def("setFadePercent", &TextFadeSurface::setFadePercent),
131132
133+ class_<TextRubiFadeSurface, Surface>("TextRubiFadeSurface")
134+ .def(constructor<const Font&, const char*, const Font&, const char*>())
135+ .def("rect", &TextRubiFadeSurface::rect)
136+ .def("setAlpha", &TextRubiFadeSurface::setAlpha)
137+ .def("draw", &TextRubiFadeSurface::draw)
138+ .def("setFadePercent", &TextRubiFadeSurface::setFadePercent),
139+
132140 class_<ColorSurface, Surface>("ColorSurface")
133141 .def(constructor<const Rect<long>&, const Color&>())
134142 .def("rect", &ColorSurface::rect)
--- trunk/libs/gui/TextRubiFadeSurface.cpp (revision 1820)
+++ trunk/libs/gui/TextRubiFadeSurface.cpp (revision 1821)
@@ -19,13 +19,13 @@
1919 Rect<long> rect_;
2020
2121
22- pImpl(const Font& font,
23- const char* text, const char* kana_only, const Font& rubi_font)
22+ pImpl(const Font& font, const char* text,
23+ const Font& rubi_font, const char* kana_only_text)
2424 {
2525 (void)font;
2626 (void)text;
27- (void)kana_only;
2827 (void)rubi_font;
28+ (void)kana_only_text;
2929
3030 // !!!
3131
@@ -35,9 +35,9 @@
3535
3636
3737 TextRubiFadeSurface::TextRubiFadeSurface(const Font& font, const char* text,
38- const char* kana_only,
39- const Font& rubi_font)
40- : pimpl(new pImpl(font, text, kana_only, rubi_font))
38+ const Font& rubi_font,
39+ const char* kana_only_text)
40+ : pimpl(new pImpl(font, text, rubi_font, kana_only_text))
4141 {
4242 }
4343
--- trunk/libs/gui/TextRubiFadeSurface.h (revision 1820)
+++ trunk/libs/gui/TextRubiFadeSurface.h (revision 1821)
@@ -24,8 +24,8 @@
2424 {
2525 public:
2626 explicit TextRubiFadeSurface(const Font& font, const char* text,
27- const char* kana_only,
28- const Font& rubi_font);
27+ const Font& rubi_font,
28+ const char* kana_only_text);
2929 ~TextRubiFadeSurface(void);
3030
3131 bool isValid(void) const;
旧リポジトリブラウザで表示