procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve boxes with checks / radios layout.

This commit is contained in:
John Preston 2017-07-04 16:59:00 +03:00
parent 0ae661edf0
commit 61461d0a87
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/boxes/autolock_box.cpp
View File

@ -34,12 +34,12 @@ void AutoLockBox::prepare() {
auto options = { 60, 300, 3600, 18000 }; auto options = { 60, 300, 3600, 18000 };
auto group = std::make_shared<Ui::RadiobuttonGroup>(Global::AutoLock()); auto group = std::make_shared<Ui::RadiobuttonGroup>(Global::AutoLock());
auto y = st::boxOptionListPadding.top(); auto y = st::boxOptionListPadding.top() + st::langsButton.margin.top();
auto count = int(options.size()); auto count = int(options.size());
_options.reserve(count); _options.reserve(count);
for (auto seconds : options) { for (auto seconds : options) {
_options.emplace_back(this, group, seconds, (seconds % 3600) ? lng_passcode_autolock_minutes(lt_count, seconds / 60) : lng_passcode_autolock_hours(lt_count, seconds / 3600), st::langsButton); _options.emplace_back(this, group, seconds, (seconds % 3600) ? lng_passcode_autolock_minutes(lt_count, seconds / 60) : lng_passcode_autolock_hours(lt_count, seconds / 3600), st::langsButton);
_options.back()->move(st::boxPadding.left() + st::boxOptionListPadding.left(), y); _options.back()->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), y);
y += _options.back()->heightNoMargins() + st::boxOptionListSkip; y += _options.back()->heightNoMargins() + st::boxOptionListSkip;
} }
group->setChangedCallback([this](int value) { durationChanged(value); }); group->setChangedCallback([this](int value) { durationChanged(value); });

2
Telegram/SourceFiles/boxes/connection_box.cpp
View File

@ -127,7 +127,7 @@ void ConnectionBox::resizeEvent(QResizeEvent *e) {
void ConnectionBox::updateControlsPosition() { void ConnectionBox::updateControlsPosition() {
auto type = _typeGroup->value(); auto type = _typeGroup->value();
_autoRadio->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), st::boxOptionListPadding.top()); _autoRadio->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _autoRadio->getMargins().top() + st::boxOptionListPadding.top());
_httpProxyRadio->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _autoRadio->bottomNoMargins() + st::boxOptionListSkip); _httpProxyRadio->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _autoRadio->bottomNoMargins() + st::boxOptionListSkip);
auto inputy = 0; auto inputy = 0;

6
Telegram/SourceFiles/boxes/download_path_box.cpp
View File

@ -57,11 +57,11 @@ void DownloadPathBox::updateControlsVisibility() {
auto custom = (_group->value() == Directory::Custom); auto custom = (_group->value() == Directory::Custom);
_pathLink->setVisible(custom); _pathLink->setVisible(custom);
auto newHeight = st::boxOptionListPadding.top() + _default->heightNoMargins() + st::boxOptionListSkip + _temp->heightNoMargins() + st::boxOptionListSkip + _dir->heightNoMargins(); auto newHeight = st::boxOptionListPadding.top() + _default->getMargins().top() + _default->heightNoMargins() + st::boxOptionListSkip + _temp->heightNoMargins() + st::boxOptionListSkip + _dir->heightNoMargins();
if (custom) { if (custom) {
newHeight += st::downloadPathSkip + _pathLink->height(); newHeight += st::downloadPathSkip + _pathLink->height();
} }
newHeight += st::boxOptionListPadding.bottom(); newHeight += st::boxOptionListPadding.bottom() + _dir->getMargins().bottom();
setDimensions(st::boxWideWidth, newHeight); setDimensions(st::boxWideWidth, newHeight);
} }
@ -69,7 +69,7 @@ void DownloadPathBox::updateControlsVisibility() {
void DownloadPathBox::resizeEvent(QResizeEvent *e) { void DownloadPathBox::resizeEvent(QResizeEvent *e) {
BoxContent::resizeEvent(e); BoxContent::resizeEvent(e);
_default->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), st::boxOptionListPadding.top()); _default->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), st::boxOptionListPadding.top() + _default->getMargins().top());
_temp->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _default->bottomNoMargins() + st::boxOptionListSkip); _temp->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _default->bottomNoMargins() + st::boxOptionListSkip);
_dir->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _temp->bottomNoMargins() + st::boxOptionListSkip); _dir->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _temp->bottomNoMargins() + st::boxOptionListSkip);
auto inputx = st::boxPadding.left() + st::boxOptionListPadding.left() + st::defaultBoxCheckbox.textPosition.x(); auto inputx = st::boxPadding.left() + st::boxOptionListPadding.left() + st::defaultBoxCheckbox.textPosition.x();

8
Telegram/SourceFiles/boxes/language_box.cpp
View File

@ -67,17 +67,17 @@ void LanguageBox::Inner::refresh() {
} }
_buttons.clear(); _buttons.clear();
auto y = st::boxOptionListPadding.top(); auto y = st::boxOptionListPadding.top() + st::langsButton.margin.top();
_buttons.reserve(_languages->size()); _buttons.reserve(_languages->size());
auto index = 0; auto index = 0;
for_const (auto &language, *_languages) { for_const (auto &language, *_languages) {
_buttons.emplace_back(this, _group, index++, language.nativeName, st::langsButton); _buttons.emplace_back(this, _group, index++, language.nativeName, st::langsButton);
auto button = _buttons.back().data(); auto button = _buttons.back().data();
button->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), y + st::langsButton.margin.top()); button->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), y);
button->show(); button->show();
y += button->heightNoMargins() + st::boxOptionListSkip; y += button->heightNoMargins() + st::boxOptionListSkip;
} }
auto newHeight = y + st::boxOptionListPadding.bottom() + st::boxPadding.bottom(); auto newHeight = y - st::boxOptionListSkip + st::boxOptionListPadding.bottom() + st::langsButton.margin.bottom();
resize(st::langsWidth, newHeight); resize(st::langsWidth, newHeight);
} }
@ -131,7 +131,7 @@ void LanguageBox::refresh() {
refreshLanguages(); refreshLanguages();
_inner->refresh(); _inner->refresh();
auto maxHeight = st::boxOptionListPadding.top() + _languages.size() * (st::langsButton.height + st::boxOptionListSkip) + st::boxOptionListPadding.bottom() + st::boxPadding.bottom(); auto maxHeight = st::boxOptionListPadding.top() + st::langsButton.margin.top() + _languages.size() * (st::langsButton.height + st::boxOptionListSkip) - st::boxOptionListSkip + st::boxOptionListPadding.bottom() + st::langsButton.margin.bottom() + st::boxPadding.bottom();
setDimensions(st::langsWidth, qMin(maxHeight, st::boxMaxListHeight)); setDimensions(st::langsWidth, qMin(maxHeight, st::boxMaxListHeight));
} }

4
Telegram/SourceFiles/boxes/report_box.cpp
View File

@ -51,7 +51,7 @@ void ReportBox::prepare() {
void ReportBox::resizeEvent(QResizeEvent *e) { void ReportBox::resizeEvent(QResizeEvent *e) {
BoxContent::resizeEvent(e); BoxContent::resizeEvent(e);
_reasonSpam->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), st::boxOptionListPadding.top()); _reasonSpam->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), st::boxOptionListPadding.top() + _reasonSpam->getMargins().top());
_reasonViolence->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _reasonSpam->bottomNoMargins() + st::boxOptionListSkip); _reasonViolence->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _reasonSpam->bottomNoMargins() + st::boxOptionListSkip);
_reasonPornography->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _reasonViolence->bottomNoMargins() + st::boxOptionListSkip); _reasonPornography->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _reasonViolence->bottomNoMargins() + st::boxOptionListSkip);
_reasonOther->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _reasonPornography->bottomNoMargins() + st::boxOptionListSkip); _reasonOther->moveToLeft(st::boxPadding.left() + st::boxOptionListPadding.left(), _reasonPornography->bottomNoMargins() + st::boxOptionListSkip);
@ -131,7 +131,7 @@ bool ReportBox::reportFail(const RPCError &error) {
} }
void ReportBox::updateMaxHeight() { void ReportBox::updateMaxHeight() {
auto newHeight = st::boxOptionListPadding.top() + 4 * _reasonSpam->heightNoMargins() + 3 * st::boxOptionListSkip + st::boxOptionListPadding.bottom(); auto newHeight = st::boxOptionListPadding.top() + _reasonSpam->getMargins().top() + 4 * _reasonSpam->heightNoMargins() + 3 * st::boxOptionListSkip + _reasonSpam->getMargins().bottom() + st::boxOptionListPadding.bottom();
if (_reasonOtherText) { if (_reasonOtherText) {
newHeight += st::newGroupDescriptionPadding.top() + _reasonOtherText->height() + st::newGroupDescriptionPadding.bottom(); newHeight += st::newGroupDescriptionPadding.top() + _reasonOtherText->height() + st::newGroupDescriptionPadding.bottom();
} }