mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-01 22:06:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--User changes

Browse Source 
-Give tabs a height of 4px in the qss files. Looks a little large on 4k screens, but just right on HD screens which are much more common.
 -Allow for styling of zero and non-zero variation tree nodes via qss.
 -Allow for toggling whether to interpolate between colors in the palette editor, or to do hard cuts between colors.
 -Allow for adjusting spinner values with the + = or up arrow keys to increase, and - _ or down arrow keys to decrease.
 -Allow for responding to global presses of + = and - _ to cycle up or down to specify which xform is set as the current one.
 -Allow for adding "layers" via xaos which will add a user-specified number of xforms, and set certain xaos values to 0 or 1.
 -Add a new menu item under the Edit menu to copy the OpenCL iteration kernel source to the clipboard.
 -Show text on the status bar which indicates that an OpenCL kernel compilation is taking place.
 -Show xform name on xform combo box when expanded. Adjust size to fit all names.
 -Draw post affine circles using dashed lines.
 -Prevent QSS dialog from styling its editor, which makes it easier to see text when creating styles which have custom colors for text boxes.

--Bug fixes
 -Fix up some table layouts which seemed to have regressed/decayed over time for reasons unknown.
 -Using undo/redo would create a new flame in the library every time.
 -Solo was not being preserved when using undo/redo.

--Code changes
 -Make the solo flag be a part of the flame data now.
 -Fix some tabification in the OpenCL code for EllipticVariation.
 -Fix tabification in the varState code for OpenCL.
 -Add an event called m_CompileBegun to RendererCL that is called right before an OpenCL compile is begun.
 --This required making RendererCLBase not a pure virtual base class. Member functions just return defaults.
 -Filter key presses on main window to only process the third one. This is due to Qt triggering three events for every key press.
 -The palette preview table was installing an event filter for seemingly no reason. Remove it.
 -Mark certain virtual functions as override in SpinBox and DoubleSpinBox.
This commit is contained in:
Person
2018-07-30 21:39:41 -07:00
parent 0deabd45b8
commit 26c558a2f5
37 changed files with 708 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Data/dark_linux.qss
View File

@ -2,12 +2,19 @@
This is needed to deal with the large tabs in the fusion theme which is the default on Linux, and optional on Windows.
It's not needed for other themes.
You should keep this at the top of whatever custom style you make to ensure the tabs aren't unusually large.*/
QTabBar::tab { height: 3ex; }
QTabBar::tab { height: 4ex; }
/*This is needed to give the labels on the status bar some padding.*/
QStatusBar QLabel { padding-left: 2px; padding-right: 2px; }
/*Specific styles below this line*/
Fractorium
{
qproperty-VariationTreeColorNonZero:black;
qproperty-VariationTreeColorZero:lightgray;
qproperty-VariationTreeBgColorNonZero:darkgray;
qproperty-VariationTreeBgColorZero:rgb(53, 53, 53);
}
QObject
{
@ -307,14 +314,12 @@ QTreeView
{
border: 1px solid gray;
background-color: rgb(53, 53, 53);
font: 9pt "MS Shell Dlg";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
font: 9pt "MS Shell Dlg 2";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
}
/*Setting this gives a more consistent look, but removes the ability to gray variations that are included in the xform*/
/*Setting this gives a more consistent look. Also, by omitting color and background color, it allows us to set it above with VariationTreeColorNonZero etc...*/
QTreeView::item
{
background-color: rgb(53, 53, 53);
color: darkgray;
outline: none;
margin-right: 1px;
}
@ -365,7 +370,7 @@ QTableView
color: darkgray;
selection-color: darkgray;
selection-background-color: rgb(53, 53, 53);
font: 9pt "MS Shell Dlg";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
font: 9pt "MS Shell Dlg 2";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
}
QTableView QTableCornerButton::section:enabled
@ -630,3 +635,8 @@ QTableView#FinalRenderParamsTable QPushButton
margin-bottom: 2px;
padding: 0px;
}
QssDialog QssTextEdit#QssEdit
{
background-color: #FFFCE1;
}

23
Data/dark_mac.qss
View File

@ -2,12 +2,19 @@
This is needed to deal with the large tabs in the fusion theme which is the default on Linux, and optional on Windows.
It's not needed for other themes.
You should keep this at the top of whatever custom style you make to ensure the tabs aren't unusually large.*/
QTabBar::tab { height: 3ex; }
QTabBar::tab { height: 4ex; }
/*This is needed to give the labels on the status bar some padding.*/
QStatusBar QLabel { padding-left: 2px; padding-right: 2px; }
/*Specific styles below this line*/
Fractorium
{
qproperty-VariationTreeColorNonZero:black;
qproperty-VariationTreeColorZero:lightgray;
qproperty-VariationTreeBgColorNonZero:darkgray;
qproperty-VariationTreeBgColorZero:rgb(53, 53, 53);
}
QObject
{
@ -307,14 +314,13 @@ QTreeView
{
border: 1px solid gray;
background-color: rgb(53, 53, 53);
font: 9pt "MS Shell Dlg";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
font: 9pt "MS Shell Dlg 2";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
}
/*Setting this gives a more consistent look, but removes the ability to gray variations that are included in the xform*/
/*Setting this gives a more consistent look. Also, by omitting color and background color, it allows us to set it above with VariationTreeColorNonZero etc...*/
QTreeView::item
{
background-color: rgb(53, 53, 53);
color: darkgray;
outline: none;
margin-right: 1px;
}
@ -365,7 +371,7 @@ QTableView
color: darkgray;
selection-color: darkgray;
selection-background-color: rgb(53, 53, 53);
font: 9pt "MS Shell Dlg";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
font: 9pt "MS Shell Dlg 2";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
}
QTableView QTableCornerButton::section:enabled
@ -630,3 +636,8 @@ QTableView#FinalRenderParamsTable QPushButton
margin-bottom: 2px;
padding: 0px;
}
QssDialog QssTextEdit#QssEdit
{
background-color: #FFFCE1;
}

22
Data/dark_windows.qss
View File

@ -2,12 +2,19 @@
This is needed to deal with the large tabs in the fusion theme which is the default on Linux, and optional on Windows.
It's not needed for other themes.
You should keep this at the top of whatever custom style you make to ensure the tabs aren't unusually large.*/
QTabBar::tab { height: 3ex; }
QTabBar::tab { height: 4ex; }
/*This is needed to give the labels on the status bar some padding.*/
QStatusBar QLabel { padding-left: 2px; padding-right: 2px; }
/*Specific styles below this line*/
Fractorium
{
qproperty-VariationTreeColorNonZero:black;
qproperty-VariationTreeColorZero:lightgray;
qproperty-VariationTreeBgColorNonZero:darkgray;
qproperty-VariationTreeBgColorZero:rgb(53, 53, 53);
}
QObject
{
@ -307,14 +314,12 @@ QTreeView
{
border: 1px solid gray;
background-color: rgb(53, 53, 53);
font: 8pt "MS Shell Dlg";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
font: 8pt "MS Shell Dlg 2";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
}
/*Setting this gives a more consistent look, but removes the ability to gray variations that are included in the xform*/
/*Setting this gives a more consistent look. Also, by omitting color and background color, it allows us to set it above with VariationTreeColorNonZero etc...*/
QTreeView::item
{
background-color: rgb(53, 53, 53);
color: darkgray;
outline: none;
margin-right: 1px;
}
@ -365,7 +370,7 @@ QTableView
color: darkgray;
selection-color: darkgray;
selection-background-color: rgb(53, 53, 53);
font: 8pt "MS Shell Dlg";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
font: 8pt "MS Shell Dlg 2";/*For some reason the font changes if you set any style. Set this to whatever font is the default on your system*/
}
QTableView QTableCornerButton::section:enabled
@ -630,3 +635,8 @@ QTableView#FinalRenderParamsTable QPushButton
margin-bottom: 2px;
padding: 0px;
}
QssDialog QssTextEdit#QssEdit
{
background-color: #FFFCE1;
}