Skip to content

fix: Update control center page and item height adjustments #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Jul 31, 2025
Merged

fix: Update control center page and item height adjustments #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion calendar-client/src/dialog/settingdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ QWidget *CSettingDialog::createControlCenterLink(QObject *obj)
auto ver = DSysInfo::majorVersion().toInt();
if (ver > 23) {
// v25 control center has changed the datetime page.
datePage = "system/timeAndLang";
datePage = "system/datetime";
qCDebug(ClientLogger) << "Using v25+ control center page:" << datePage;
}
this->m_controlCenterProxy->ShowPage(datePage);
Expand Down
4 changes: 2 additions & 2 deletions calendar-client/src/widget/monthWidget/monthscheduleview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void CMonthScheduleView::slotFontChange()

if (m_ItemHeight != h) {
qCDebug(ClientLogger) << "Font height changed, updating data";
m_ItemHeight = h;
m_ItemHeight = h + 1;
updateData();
}
}
Expand Down Expand Up @@ -254,7 +254,7 @@ void CMonthScheduleView::computePos(int cNum, QDate bgeindate, QDate enddate, QP
int ecol = (m_beginDate.daysTo(enddate)) % DDEMonthCalendar::AFewDaysOfWeek;

fw = static_cast<int>((ecol - bcol + 1) * ((m_width - m_leftMargin) / 7.0) - 11);
fh = m_ItemHeight;
fh = m_ItemHeight + 2;
int x = static_cast<int>(m_leftMargin + bcol * ((m_width - m_leftMargin) / 7.0) + 5);
//根据UI图调整item坐标
int y = static_cast<int>(m_topMargin + ((m_height - m_topMargin - m_bottomMargin) / 6.0) * brow + schedule_Item_Y + (cNum - 1) * fh);
Expand Down
Loading