Nux

Merge lp:~hikiko/nux/nux.virtual-StaticText-func into lp:nux

Proposed by Eleni Maria Stea
Status: Work in progress
Proposed branch: lp:~hikiko/nux/nux.virtual-StaticText-func
Merge into: lp:nux
Diff against target: 25 lines (+2/-2)
2 files modified
Nux/AbstractButton.h (+1/-1)
Nux/Button.h (+1/-1)
To merge this branch: bzr merge lp:~hikiko/nux/nux.virtual-StaticText-func
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity Team Pending
Review via email: mp+218246@code.launchpad.net

Commit message

minor change to nux: some functions that use StaticText are converted to virtual in order to override them in unity and replace the StaticText with the scalable StaticCairoText.

Description of the change

minor change to nux: some functions that use StaticText are converted to virtual in order to override them in unity and replace the StaticText with the scalable StaticCairoText.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote :

This is an ABI change. Please make sure an ABI bump MP also gets proposed and merged at the same time as this one.

Unmerged revisions

846. By Eleni Maria Stea

functions that use StaticText should be virtual because we ll override them
in unity (to replace StaticText with StaticCairoText)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Nux/AbstractButton.h'
2--- Nux/AbstractButton.h 2011-10-18 20:00:59 +0000
3+++ Nux/AbstractButton.h 2014-05-05 07:01:11 +0000
4@@ -93,7 +93,7 @@
5
6 @param color the text color.
7 */
8- void SetLabelColor(const Color &color);
9+ virtual void SetLabelColor(const Color &color);
10
11 //! Get the text color.
12 /*!
13
14=== modified file 'Nux/Button.h'
15--- Nux/Button.h 2011-10-22 06:17:42 +0000
16+++ Nux/Button.h 2014-05-05 07:01:11 +0000
17@@ -247,7 +247,7 @@
18
19 void Initialize(const std::string &str, TextureArea* texture_area);
20
21- void BuildLayout(const std::string &str, TextureArea* texture_area);
22+ virtual void BuildLayout(const std::string &str, TextureArea* texture_area);
23
24 TextureArea *image_;
25 Size image_minimum_size_;

Subscribers

People subscribed via source and target branches