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

More changes (#269)

Browse source
This commit is contained in:
Jeremy Bullock 2020-10-01 22:30:20 -06:00 committed by GitHub
parent d2a6a32213
commit b5582c8ede
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toonz/sources/tnztools/rastertapetool.cpp
View file

@ -34,10 +34,10 @@
using namespace ToolUtils;
TEnv::StringVar AutocloseVectorType("InknpaintAutocloseVectorType", "Normal");
TEnv::DoubleVar AutocloseDistance("InknpaintAutocloseDistance", 10.0);
TEnv::DoubleVar AutocloseDistance("InknpaintAutocloseDistance", 20.0);
TEnv::DoubleVar AutocloseAngle("InknpaintAutocloseAngle", 60.0);
TEnv::IntVar AutocloseRange("InknpaintAutocloseRange", 0);
TEnv::IntVar AutocloseOpacity("InknpaintAutocloseOpacity", 1);
TEnv::IntVar AutocloseOpacity("InknpaintAutocloseOpacity", 180);
#define NORMAL_CLOSE L"Normal"
#define RECT_CLOSE L"Rectangular"
#define FREEHAND_CLOSE L"Freehand"

4
toonz/sources/tnztools/vectorselectiontool.cpp
View file

@ -416,12 +416,14 @@ void DragSelectionTool::UndoChangeStrokes::restoreRegions() const {
void DragSelectionTool::UndoChangeStrokes::undo() const {
transform(m_oldStrokes, m_oldBBox, m_oldCenter, m_oldDeformValues);
restoreRegions();
m_tool->notifyImageChanged();
}
//-----------------------------------------------------------------------------
void DragSelectionTool::UndoChangeStrokes::redo() const {
transform(m_newStrokes, m_newBBox, m_newCenter, m_newDeformValues);
m_tool->notifyImageChanged();
}
//-----------------------------------------------------------------------------
@ -521,6 +523,7 @@ void UndoChangeOutlineStyle::transform(
void UndoChangeOutlineStyle::undo() const {
transform(m_oldOptions, m_oldBBox);
TTool::getApplication()->getCurrentTool()->notifyToolChanged();
m_tool->notifyImageChanged();
}
//-----------------------------------------------------------------------------
@ -528,6 +531,7 @@ void UndoChangeOutlineStyle::undo() const {
void UndoChangeOutlineStyle::redo() const {
transform(m_newOptions, m_newBBox);
TTool::getApplication()->getCurrentTool()->notifyToolChanged();
m_tool->notifyImageChanged();
}
//-----------------------------------------------------------------------------

1
toonz/sources/toonz/convertpopup.cpp
View file

@ -752,6 +752,7 @@ void ConvertPopup::onFormatSelected(const QString &format) {
m_bgColorLabel->setVisible(!isTlv && !isPli && !isOldLevel2Tlv);
m_tlvFrame->setVisible(isTlv);
m_mainFrame->setFixedHeight(isTlv ? 425 : 220);
// m_svgFrame->setVisible(isPli);
if (isTlv) {

3
toonz/sources/toonz/projectpopup.cpp
View file

@ -50,6 +50,9 @@ TFilePath getDocumentsPath() {
ProjectPopup::ProjectPopup(bool isModal)
: Dialog(TApp::instance()->getMainWindow(), isModal, false, "Project") {
TProjectManager *pm = TProjectManager::instance();
m_mainFrame->setFixedHeight(100);
m_mainFrame->setMinimumWidth(400);
this->layout()->setSizeConstraint(QLayout::SetFixedSize);
m_choosePrjLabel = new QLabel(tr("Project:"), this);
m_prjNameLabel = new QLabel(tr("Project Name:"), this);

2
toonz/sources/toonz/viewerdraw.cpp
View file

@ -719,7 +719,7 @@ void ViewerDraw::drawGridsAndOverlays(SceneViewer *viewer, double pixelSize) {
glEnable(GL_LINE_SMOOTH);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor4d(1.0, 0.3, 1.0, (double)GuideOpacity / 100.0);
glLineWidth(0.5f);
glLineWidth(1.0f);
double lengthX = rect.x1 - rect.x0;
double lengthY = rect.y1 - rect.y0;