FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-08-05 11:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Closed beta 10019001: style::color copy is denied, only const refs.

Browse Source
This commit is contained in:
John Preston
2016-11-03 13:33:57 +03:00
parent 5d10c02b5b
commit 2a3fd0066d
44 changed files with 344 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/ui/flatbutton.cpp
+11 -9
View File
@@ -31,12 +31,14 @@ FlatButton::FlatButton(QWidget *parent, const QString &text, const style::flatBu
, _a_appearance(animation(this, &FlatButton::step_appearance))
, _opacity(1) {
if (_st.width < 0) {
_st.width = textWidth() - _st.width;
_width = textWidth() - _st.width;
} else if (!_st.width) {
_st.width = textWidth() + _st.height - _st.font->height;
_width = textWidth() + _st.height - _st.font->height;
} else {
_width = _st.width;
}
connect(this, SIGNAL(stateChanged(int, ButtonStateChangeSource)), this, SLOT(onStateChange(int, ButtonStateChangeSource)));
resize(_st.width, _st.height);
resize(_width, _st.height);
setCursor(_st.cursor);
}
@@ -55,13 +57,13 @@ void FlatButton::setText(const QString &text) {
}
void FlatButton::setWidth(int32 w) {
_st.width = w;
if (_st.width < 0) {
_st.width = textWidth() - _st.width;
} else if (!_st.width) {
_st.width = textWidth() + _st.height - _st.font->height;
_width = w;
if (_width < 0) {
_width = textWidth() - _st.width;
} else if (!_width) {
_width = textWidth() + _st.height - _st.font->height;
}
resize(_st.width, height());
resize(_width, height());
}
int32 FlatButton::textWidth() const {