Changeset View
Changeset View
Standalone View
Standalone View
x11client.cpp
Show First 20 Lines • Show All 3619 Lines • ▼ Show 20 Line(s) | 3611 | if (isDecorated()) { | |||
---|---|---|---|---|---|
3620 | if (decominsize.height() > min_size.height()) | 3620 | if (decominsize.height() > min_size.height()) | ||
3621 | min_size.setHeight(decominsize.height()); | 3621 | min_size.setHeight(decominsize.height()); | ||
3622 | } | 3622 | } | ||
3623 | w = qMin(max_size.width(), w); | 3623 | w = qMin(max_size.width(), w); | ||
3624 | h = qMin(max_size.height(), h); | 3624 | h = qMin(max_size.height(), h); | ||
3625 | w = qMax(min_size.width(), w); | 3625 | w = qMax(min_size.width(), w); | ||
3626 | h = qMax(min_size.height(), h); | 3626 | h = qMax(min_size.height(), h); | ||
3627 | 3627 | | |||
3628 | int w1 = w; | 3628 | if (!rules()->checkStrictGeometry(!isFullScreen())) { | ||
3629 | int h1 = h; | 3629 | // Disobey increments and aspect by explicit rule. | ||
3630 | return QSize(w, h); | ||||
3631 | } | ||||
3632 | | ||||
3630 | int width_inc = m_geometryHints.resizeIncrements().width(); | 3633 | int width_inc = m_geometryHints.resizeIncrements().width(); | ||
3631 | int height_inc = m_geometryHints.resizeIncrements().height(); | 3634 | int height_inc = m_geometryHints.resizeIncrements().height(); | ||
3632 | int basew_inc = m_geometryHints.baseSize().width(); | 3635 | int basew_inc = m_geometryHints.baseSize().width(); | ||
3633 | int baseh_inc = m_geometryHints.baseSize().height(); | 3636 | int baseh_inc = m_geometryHints.baseSize().height(); | ||
3634 | if (!m_geometryHints.hasBaseSize()) { | 3637 | if (!m_geometryHints.hasBaseSize()) { | ||
3635 | basew_inc = m_geometryHints.minSize().width(); | 3638 | basew_inc = m_geometryHints.minSize().width(); | ||
3636 | baseh_inc = m_geometryHints.minSize().height(); | 3639 | baseh_inc = m_geometryHints.minSize().height(); | ||
3637 | } | 3640 | } | ||
▲ Show 20 Lines • Show All 107 Lines • ▼ Show 20 Line(s) | 3724 | #endif | |||
3745 | } | 3748 | } | ||
3746 | #undef ASPECT_CHECK_SHRINK_H_GROW_W | 3749 | #undef ASPECT_CHECK_SHRINK_H_GROW_W | ||
3747 | #undef ASPECT_CHECK_SHRINK_W_GROW_H | 3750 | #undef ASPECT_CHECK_SHRINK_W_GROW_H | ||
3748 | #undef ASPECT_CHECK_GROW_W | 3751 | #undef ASPECT_CHECK_GROW_W | ||
3749 | #undef ASPECT_CHECK_GROW_H | 3752 | #undef ASPECT_CHECK_GROW_H | ||
3750 | w += baseSize.width(); | 3753 | w += baseSize.width(); | ||
3751 | h += baseSize.height(); | 3754 | h += baseSize.height(); | ||
3752 | } | 3755 | } | ||
3753 | if (!rules()->checkStrictGeometry(!isFullScreen())) { | | |||
3754 | // disobey increments and aspect by explicit rule | | |||
3755 | w = w1; | | |||
3756 | h = h1; | | |||
3757 | } | | |||
3758 | 3756 | | |||
3759 | return QSize(w, h); | 3757 | return QSize(w, h); | ||
3760 | } | 3758 | } | ||
3761 | 3759 | | |||
3762 | /** | 3760 | /** | ||
3763 | * Gets the client's normal WM hints and reconfigures itself respectively. | 3761 | * Gets the client's normal WM hints and reconfigures itself respectively. | ||
3764 | */ | 3762 | */ | ||
3765 | void X11Client::getWmNormalHints() | 3763 | void X11Client::getWmNormalHints() | ||
▲ Show 20 Lines • Show All 1277 Lines • Show Last 20 Lines |