mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-23 13:31:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

-Bug fixes:

Browse Source 
--Adjust xaos cells when any group modification is made, such as random, clear, or row/col change.
--Remove some old style sheet code on the xforms tab that doesn't seem to make sense and was probably just a workaround for a transient Qt bug, of which there are hundreds.
This commit is contained in:
mfeemster 2015-09-14 20:53:19 -07:00
parent e8b8d70f47
commit 16dbbf1b29
3 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Fractorium/Fractorium.ui
View File

@ -2604,29 +2604,6 @@
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="styleSheet">
<string notr="true">QTabWidget::pane
{
border: 1px solid #898C95;
font: 9pt &quot;Segoe UI&quot;;
}
QTabWidget::tab-bar
{
bottom: -1px;
}
DoubleSpinBox
{
font: 9pt &quot;Segoe UI&quot;;
}
SpinBox
{
font: 9pt &quot;Segoe UI&quot;;
}
</string>
</property>
<property name="tabShape"> <property name="tabShape">
<enum>QTabWidget::Triangular</enum> <enum>QTabWidget::Triangular</enum>
</property> </property>

7
Source/Fractorium/FractoriumXaos.cpp
View File

@ -44,6 +44,9 @@ void FractoriumEmberController<T>::FillXaos()
} }
} }
} }
m_Fractorium->ui.XaosTableView->resizeRowsToContents();
m_Fractorium->ui.XaosTableView->resizeColumnsToContents();
} }
/// <summary> /// <summary>
@ -199,6 +202,8 @@ void Fractorium::OnRandomXaosButtonClicked(bool checked) { m_Controller->RandomX
void Fractorium::OnXaosRowDoubleClicked(int logicalIndex) void Fractorium::OnXaosRowDoubleClicked(int logicalIndex)
{ {
ToggleTableRow(ui.XaosTableView, logicalIndex); ToggleTableRow(ui.XaosTableView, logicalIndex);
ui.XaosTableView->resizeRowsToContents();
ui.XaosTableView->resizeColumnsToContents();
} }
/// <summary> /// <summary>
@ -209,6 +214,8 @@ void Fractorium::OnXaosRowDoubleClicked(int logicalIndex)
void Fractorium::OnXaosColDoubleClicked(int logicalIndex) void Fractorium::OnXaosColDoubleClicked(int logicalIndex)
{ {
ToggleTableCol(ui.XaosTableView, logicalIndex); ToggleTableCol(ui.XaosTableView, logicalIndex);
ui.XaosTableView->resizeRowsToContents();
ui.XaosTableView->resizeColumnsToContents();
} }
template class FractoriumEmberController<float>; template class FractoriumEmberController<float>;

27
Source/Fractorium/FractoriumXforms.cpp
View File

@ -31,7 +31,32 @@ void Fractorium::InitXformsUI()
connect(ui.XformWeightNameTable, SIGNAL(cellChanged(int, int)), this, SLOT(OnXformNameChanged(int, int)), Qt::QueuedConnection); connect(ui.XformWeightNameTable, SIGNAL(cellChanged(int, int)), this, SLOT(OnXformNameChanged(int, int)), Qt::QueuedConnection);
ui.CurrentXformCombo->setProperty("soloxform", -1); ui.CurrentXformCombo->setProperty("soloxform", -1);
/*
ui.XformsTabWidget->setStyleSheet(
"QTabWidget::pane \n"
"{\n"
" border: 5px solid #898C95;\n"
" font: 9pt &quot;Segoe UI&quot;;\n"
"}\n"
"\n"
"QTabWidget::tab-bar \n"
"{\n"
" bottom: -8px;\n"
"}\n"
"\n"
"DoubleSpinBox \n"
"{\n"
" font: 9pt &quot;Segoe UI&quot;;\n"
"}\n"
"\n"
"SpinBox \n"
"{\n"
" font: 9pt &quot;Segoe UI&quot;;\n"
"}"
);
*/
#ifndef WIN32 #ifndef WIN32
//For some reason linux makes these 24x24, even though the designer explicitly says 16x16. //For some reason linux makes these 24x24, even though the designer explicitly says 16x16.
ui.AddXformButton->setIconSize(QSize(16, 16)); ui.AddXformButton->setIconSize(QSize(16, 16));