Commit 53bd0a1c authored by Boudewijn Rempt's avatar Boudewijn Rempt

Fix indentation

parent 7b1da13b
...@@ -587,7 +587,7 @@ void KisPaintopBox::slotInputDeviceChanged(const KoInputDevice& inputDevice) ...@@ -587,7 +587,7 @@ void KisPaintopBox::slotInputDeviceChanged(const KoInputDevice& inputDevice)
if (toolData == m_tabletToolMap.end()) { if (toolData == m_tabletToolMap.end()) {
KisPaintOpPresetSP preset = KisPaintOpPresetSP preset =
m_resourceProvider->currentPreset()->clone(); m_resourceProvider->currentPreset()->clone();
m_resourceProvider->setPaintOpPreset(preset); m_resourceProvider->setPaintOpPreset(preset);
setCurrentPaintop(preset->paintOp(), preset); setCurrentPaintop(preset->paintOp(), preset);
} else { } else {
...@@ -599,7 +599,7 @@ void KisPaintopBox::slotInputDeviceChanged(const KoInputDevice& inputDevice) ...@@ -599,7 +599,7 @@ void KisPaintopBox::slotInputDeviceChanged(const KoInputDevice& inputDevice)
void KisPaintopBox::slotCanvasResourceChanged(int /*key*/, const QVariant& /*v*/) void KisPaintopBox::slotCanvasResourceChanged(int /*key*/, const QVariant& /*v*/)
{ {
if (m_viewManager) { if (m_viewManager) {
sender()->blockSignals(true); sender()->blockSignals(true);
KisPaintOpPresetSP preset = m_viewManager->resourceProvider()->resourceManager()->resource(KisCanvasResourceProvider::CurrentPaintOpPreset).value<KisPaintOpPresetSP>(); KisPaintOpPresetSP preset = m_viewManager->resourceProvider()->resourceManager()->resource(KisCanvasResourceProvider::CurrentPaintOpPreset).value<KisPaintOpPresetSP>();
if (preset && m_resourceProvider->currentPreset()->name() != preset->name()) { if (preset && m_resourceProvider->currentPreset()->name() != preset->name()) {
...@@ -743,35 +743,35 @@ void KisPaintopBox::slotToggleEraseMode(bool checked) ...@@ -743,35 +743,35 @@ void KisPaintopBox::slotToggleEraseMode(bool checked)
{ {
if (checked) if (checked)
{ {
updateCompositeOp(COMPOSITE_ERASE); updateCompositeOp(COMPOSITE_ERASE);
//add an option to enable eraser brush size //add an option to enable eraser brush size
if (m_eraserBrushSizeEnabled==true) if (m_eraserBrushSizeEnabled==true)
{ {
// remember brush size. set the eraser size to the normal brush size if not set // remember brush size. set the eraser size to the normal brush size if not set
normalBrushSize = m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("size")->value(); normalBrushSize = m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("size")->value();
if (!eraserBrushSize) if (!eraserBrushSize)
eraserBrushSize = normalBrushSize; eraserBrushSize = normalBrushSize;
} }
else else
{ {
normalBrushSize = eraserBrushSize; normalBrushSize = eraserBrushSize;
eraserBrushSize = m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("size")->value(); eraserBrushSize = m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("size")->value();
} }
} }
else else
{ {
updateCompositeOp(m_prevCompositeOpID); updateCompositeOp(m_prevCompositeOpID);
if (m_eraserBrushSizeEnabled==true) if (m_eraserBrushSizeEnabled==true)
{ {
// save eraser brush size as eraserBrushSize (they are all the same, so just grab the first one) // save eraser brush size as eraserBrushSize (they are all the same, so just grab the first one)
eraserBrushSize = m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("size")->value(); eraserBrushSize = m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("size")->value();
} }
else else
{ {
normalBrushSize = m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("size")->value(); normalBrushSize = m_sliderChooser[0]->getWidget<KisDoubleSliderSpinBox>("size")->value();
} }
} }
...@@ -1067,9 +1067,9 @@ void KisPaintopBox::slotDirtyPresetToggled(bool value) ...@@ -1067,9 +1067,9 @@ void KisPaintopBox::slotDirtyPresetToggled(bool value)
} }
void KisPaintopBox::slotEraserBrushSizeToggled(bool value) void KisPaintopBox::slotEraserBrushSizeToggled(bool value)
{ {
m_eraserBrushSizeEnabled = value; m_eraserBrushSizeEnabled = value;
KisConfig cfg; KisConfig cfg;
cfg.setUseEraserBrushSize(m_eraserBrushSizeEnabled); cfg.setUseEraserBrushSize(m_eraserBrushSizeEnabled);
} }
void KisPaintopBox::slotUpdateSelectionIcon() void KisPaintopBox::slotUpdateSelectionIcon()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment