razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix issues with starting maximized not working (#236)

Browse source
This commit is contained in:
Jeremy Bullock 2020-09-27 16:20:03 -06:00 committed by GitHub
parent 52a6dbf0e5
commit 967ad6de14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
toonz/sources/toonzqt/docklayout.cpp
View file

@ -458,43 +458,45 @@ bool Region::checkWidgetsToBeFixedWidth(std::vector<QWidget *> &widgets,
return ret;
}
}
//------------------------------------------------------
bool Region::checkWidgetsToBeFixedHeight(std::vector<QWidget *> &widgets,
bool &fromDocking) {
if (m_item) {
if (m_item->wasFloating()) {
fromDocking = true;
m_item->clearWasFloating();
return false;
}
if ((m_item->objectName() == "Timeline")) {
widgets.push_back(m_item);
return true;
} else
return false;
}
if (m_childList.empty()) return false;
// for vertical orientation, return true if all items are to be fixed
if (m_orientation == vertical) {
bool ret = true;
for (Region *childRegion : m_childList) {
if (!childRegion->checkWidgetsToBeFixedHeight(widgets, fromDocking))
ret = false;
}
return ret;
}
// for horizontal orientation, return true if at least one item is to be fixed
else {
bool ret = false;
for (Region *childRegion : m_childList) {
if (childRegion->checkWidgetsToBeFixedHeight(widgets, fromDocking))
ret = true;
}
return ret;
}
}
// As much as I want this to work.
// This causes issues on maximize if the timeline is too tall.
////------------------------------------------------------
//
// bool Region::checkWidgetsToBeFixedHeight(std::vector<QWidget *> &widgets,
// bool &fromDocking) {
// if (m_item) {
// if (m_item->wasFloating()) {
// fromDocking = true;
// m_item->clearWasFloating();
// return false;
// }
// if ((m_item->objectName() == "Timeline")) {
// widgets.push_back(m_item);
// return true;
// } else
// return false;
// }
// if (m_childList.empty()) return false;
// // for vertical orientation, return true if all items are to be fixed
// if (m_orientation == vertical) {
// bool ret = true;
// for (Region *childRegion : m_childList) {
// if (!childRegion->checkWidgetsToBeFixedHeight(widgets, fromDocking))
// ret = false;
// }
// return ret;
// }
// // for horizontal orientation, return true if at least one item is to be
// fixed
// else {
// bool ret = false;
// for (Region *childRegion : m_childList) {
// if (childRegion->checkWidgetsToBeFixedHeight(widgets, fromDocking))
// ret = true;
// }
// return ret;
// }
//}
//------------------------------------------------------
@ -514,17 +516,18 @@ void DockLayout::redistribute() {
bool fromDocking = false;
bool widgetsCanBeFixedWidth =
!m_regions.front()->checkWidgetsToBeFixedWidth(widgets, fromDocking);
bool widgetsCanBeFixedHeight = false;
if (!fromDocking)
widgetsCanBeFixedHeight = !m_regions.front()->checkWidgetsToBeFixedHeight(
fixedHeightWidgets, fromDocking);
// bool widgetsCanBeFixedHeight = false;
// if (!fromDocking)
// widgetsCanBeFixedHeight =
// !m_regions.front()->checkWidgetsToBeFixedHeight(
// fixedHeightWidgets, fromDocking);
if (!fromDocking && widgetsCanBeFixedWidth) {
for (QWidget *widget : widgets) widget->setFixedWidth(widget->width());
}
if (!fromDocking && widgetsCanBeFixedHeight) {
for (QWidget *widget : fixedHeightWidgets)
widget->setFixedHeight(widget->height());
}
// if (!fromDocking && widgetsCanBeFixedHeight) {
// for (QWidget *widget : fixedHeightWidgets)
// widget->setFixedHeight(widget->height());
//}
m_regions.front()->calculateExtremalSizes();
@ -549,12 +552,12 @@ void DockLayout::redistribute() {
widget->setMinimumSize(0, 0);
}
}
if (!fromDocking && widgetsCanBeFixedHeight) {
for (QWidget *widget : fixedHeightWidgets) {
widget->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
widget->setMinimumSize(0, 0);
}
}
// if (!fromDocking && widgetsCanBeFixedHeight) {
// for (QWidget *widget : fixedHeightWidgets) {
// widget->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
// widget->setMinimumSize(0, 0);
// }
//}
}
// Finally, apply Region geometries found

5
toonz/sources/toonzqt/docklayout.h
View file

@ -535,8 +535,9 @@ public:
bool checkWidgetsToBeFixedWidth(std::vector<QWidget *> &widgets,
bool &fromDocking);
bool checkWidgetsToBeFixedHeight(std::vector<QWidget *> &widgets,
bool &fromDocking);
// This causes issues on maximize if the timeline is too tall.
// bool checkWidgetsToBeFixedHeight(std::vector<QWidget *> &widgets,
// bool &fromDocking);
private:
// Setters - private