diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-01-28 18:17:01 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-01-28 18:17:01 +0100 |
| commit | 180eacc2af8a69b8ee947750ae7708b78c499f7d (patch) | |
| tree | 915875240faf34c2c0bedeef1d8e25df213a1b19 /plugingui | |
| parent | 6e2fb62b35b5545c866dc1acf00857e1d160ff5e (diff) | |
Revert files that shouldn't have been changed in this branch...
Diffstat (limited to 'plugingui')
| -rw-r--r-- | plugingui/font.cc | 4 | ||||
| -rw-r--r-- | plugingui/widget.cc | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/plugingui/font.cc b/plugingui/font.cc index d02efe7..bcaa027 100644 --- a/plugingui/font.cc +++ b/plugingui/font.cc @@ -88,9 +88,9 @@ size_t Font::textHeight(const std::string& text) const return img_font.height(); } -void Font::setLetterSpacing(int letter_spacing) +void Font::setLetterSpacing(int letterSpacing) { - spacing = letter_spacing; + spacing = letterSpacing; } int Font::letterSpacing() const diff --git a/plugingui/widget.cc b/plugingui/widget.cc index 5c8ff46..4b92e65 100644 --- a/plugingui/widget.cc +++ b/plugingui/widget.cc @@ -136,7 +136,6 @@ size_t Widget::height() size_t Widget::windowX() { size_t window_x = x(); - if(parent) { window_x += parent->windowX(); |