UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Match names everywhere

Browse Source
This commit is contained in:
mateoconlechuga
2017-09-01 20:06:59 -06:00
parent 9d155f325b
commit 22b74892d7
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/apps_window.cpp
View File

@@ -31,7 +31,7 @@ void AppsWindow::refreshPreferences() {
}
bool AppsWindow::updateAlphaLock() {
return m_titleBarView.setAlphaLockStatus(Ion::Events::shiftAlphaStatus());
return m_titleBarView.setShiftAlphaLockStatus(Ion::Events::shiftAlphaStatus());
}
void AppsWindow::hideTitleBarView(bool hide) {

10
apps/title_bar_view.cpp
View File

@@ -42,8 +42,8 @@ bool TitleBarView::setIsPlugged(bool isPlugged) {
return m_batteryView.setIsPlugged(isPlugged);
}
bool TitleBarView::setAlphaLockStatus(Ion::Events::ShiftAlphaStatus status) {
return m_alphaLockView.setStatus(status);
bool TitleBarView::setShiftAlphaLockStatus(Ion::Events::ShiftAlphaStatus status) {
return m_shiftAlphaLockView.setStatus(status);
}
int TitleBarView::numberOfSubviews() const {
@@ -61,7 +61,7 @@ View * TitleBarView::subviewAtIndex(int index) {
return &m_examModeIconView;
}
if (index == 3) {
return &m_alphaLockView;
return &m_shiftAlphaLockView;
}
return &m_batteryView;
}
@@ -81,8 +81,8 @@ void TitleBarView::layoutSubviews() {
} else {
m_examModeIconView.setFrame(KDRectZero);
}
KDSize alphaLockSize = m_alphaLockView.minimalSizeForOptimalDisplay();
m_alphaLockView.setFrame(KDRect(bounds().width()-batterySize.width()-k_batteryRightMargin-k_alphaRightMargin-alphaLockSize.width(), (bounds().height()- alphaLockSize.height())/2, alphaLockSize));
KDSize shiftAlphaLockSize = m_shiftAlphaLockView.minimalSizeForOptimalDisplay();
m_shiftAlphaLockView.setFrame(KDRect(bounds().width()-batterySize.width()-k_batteryRightMargin-k_alphaRightMargin-shiftAlphaLockSize.width(), (bounds().height()- shiftAlphaLockSize.height())/2, shiftAlphaLockSize));
}
void TitleBarView::refreshPreferences() {

4
apps/title_bar_view.h
View File

@@ -15,7 +15,7 @@ public:
bool setChargeState(Ion::Battery::Charge chargeState);
bool setIsCharging(bool isCharging);
bool setIsPlugged(bool isPlugged);
bool setAlphaLockStatus(Ion::Events::ShiftAlphaStatus status);
bool setShiftAlphaLockStatus(Ion::Events::ShiftAlphaStatus status);
void refreshPreferences();
private:
constexpr static KDCoordinate k_batteryRightMargin = 5;
@@ -29,7 +29,7 @@ private:
View * subviewAtIndex(int index) override;
MessageTextView m_titleView;
BatteryView m_batteryView;
ShiftAlphaLockView m_alphaLockView;
ShiftAlphaLockView m_shiftAlphaLockView;
BufferTextView m_preferenceView;
ImageView m_examModeIconView;
};