Differential D18412 Diff 49957 libs/ui/opengl/kis_opengl_canvas2.cpp

Changeset View

Standalone View

View Options

libs/ui/opengl/kis_opengl_canvas2.cpp

Context not available.
111 QColor gridColor; 111​ QColor gridColor;
112 QColor cursorColor; 112​ QColor cursorColor;
113 113​
114​ // individually turn on/off horizontal or vertial aspect of wrap-around mode
yurchorUnsubmitted
Not Done

Typo: vertial -> vertical

yurchor: Typo: vertial -> vertical
115​ bool isHorizontalWrapAround = true;
116​ bool isVerticalWrapAround = true;
117​
114 bool lodSwitchInProgress = false; 118​ bool lodSwitchInProgress = false;
115 119​
116 int xToColWithWrapCompensation(int x, const QRect &imageRect) { 120​ int xToColWithWrapCompensation(int x, const QRect &imageRect) {
Context not available.
172 176​
173 connect(KisConfigNotifier::instance(), SIGNAL(configChanged()), SLOT(slotConfigChanged())); 177​ connect(KisConfigNotifier::instance(), SIGNAL(configChanged()), SLOT(slotConfigChanged()));
174 connect(KisConfigNotifier::instance(), SIGNAL(pixelGridModeChanged()), SLOT(slotPixelGridModeChanged())); 178​ connect(KisConfigNotifier::instance(), SIGNAL(pixelGridModeChanged()), SLOT(slotPixelGridModeChanged()));
179​ connect(KisConfigNotifier::instance(), SIGNAL(wraparoundModeChanged()), SLOT(slotWraparoundModeChanged()));
180​
181​
175 slotConfigChanged(); 182​ slotConfigChanged();
176 slotPixelGridModeChanged(); 183​ slotPixelGridModeChanged();
177 cfg.writeEntry("canvasState", "OPENGL_SUCCESS"); 184​ cfg.writeEntry("canvasState", "OPENGL_SUCCESS");
Context not available.
488 QRectF textureRect; 495​ QRectF textureRect;
489 QRectF modelRect; 496​ QRectF modelRect;
490 497​
491 QRectF viewportRect = !d->wrapAroundMode ? 498​ QRectF canvasWidgetRect = converter->widgetToViewport(this->rect());
492 converter->imageRectInViewportPixels() : 499​ QRectF imageRect = converter->imageRectInViewportPixels();
493 converter->widgetToViewport(this->rect()); 500​
501​ QRectF viewportRect = !d->wrapAroundMode ? imageRect : canvasWidgetRect;
502​
503​
504​ if (d->wrapAroundMode) {
505​ if (d->isHorizontalWrapAround == true && d->isVerticalWrapAround == false ) {
506​ viewportRect = QRectF(canvasWidgetRect.x(), imageRect.y(), canvasWidgetRect.width(), imageRect.height());
507​ }
508​ else if (d->isVerticalWrapAround == true && d->isHorizontalWrapAround == false) {
509​ viewportRect = QRectF(imageRect.x(), canvasWidgetRect.y(), imageRect.width(), canvasWidgetRect.height());
510​ }
511​ else if (d->isVerticalWrapAround == false && d->isHorizontalWrapAround == false) {
512​ viewportRect = imageRect;
513​ }
514​ }
515​
494 516​
495 if (!canvas()->renderingLimit().isEmpty()) { 517​ if (!canvas()->renderingLimit().isEmpty()) {
496 const QRect vrect = converter->imageToViewport(canvas()->renderingLimit()).toAlignedRect(); 518​ const QRect vrect = converter->imageToViewport(canvas()->renderingLimit()).toAlignedRect();
Context not available.
665 QRect ir = d->openGLImageTextures->storedImageBounds(); 687​ QRect ir = d->openGLImageTextures->storedImageBounds();
666 QRect wr = widgetRectInImagePixels.toAlignedRect(); 688​ QRect wr = widgetRectInImagePixels.toAlignedRect();
667 689​
690​ // the order of this if statement is important, so don't move to the other wrapAroundMode logic
668 if (!d->wrapAroundMode) { 691​ if (!d->wrapAroundMode) {
669 // if we don't want to paint wrapping images, just limit the 692​ // if we don't want to paint wrapping images, just limit the
670 // processing area, and the code will handle all the rest 693​ // processing area, and the code will handle all the rest
Context not available.
673 696​
674 int firstColumn = d->xToColWithWrapCompensation(wr.left(), ir); 697​ int firstColumn = d->xToColWithWrapCompensation(wr.left(), ir);
675 int lastColumn = d->xToColWithWrapCompensation(wr.right(), ir); 698​ int lastColumn = d->xToColWithWrapCompensation(wr.right(), ir);
699​
676 int firstRow = d->yToRowWithWrapCompensation(wr.top(), ir); 700​ int firstRow = d->yToRowWithWrapCompensation(wr.top(), ir);
677 int lastRow = d->yToRowWithWrapCompensation(wr.bottom(), ir); 701​ int lastRow = d->yToRowWithWrapCompensation(wr.bottom(), ir);
678 702​
703​
704​ if (d->wrapAroundMode) {
705​
706​ if (d->isHorizontalWrapAround == true && d->isVerticalWrapAround == false ) {
707​ // only wrap-around horizontal
708​ firstRow = 0;
709​ lastRow = 1;
710​
711​ }else if (d->isVerticalWrapAround == true && d->isHorizontalWrapAround == false) {
712​ // only wrap vertically
dkazakovUnsubmitted
Not Done

space is lost :)

dkazakov: space is lost :)
713​ firstColumn = 0;
714​ lastColumn = 1;
715​
716​ } else if (d->isVerticalWrapAround == false && d->isHorizontalWrapAround == false) {
717​ // wrap along both axis, but don't actually display both axis
yurchorUnsubmitted
Not Done

Typo: axis -> axes

yurchor: Typo: axis -> axes
718​ firstColumn = d->xToColWithWrapCompensation(ir.left(), ir);
719​ lastColumn = d->xToColWithWrapCompensation(ir.right(), ir);
720​ firstRow = d->yToRowWithWrapCompensation(ir.top(), ir);
721​ lastRow = d->yToRowWithWrapCompensation(ir.bottom(), ir);
722​ }
723​ }
724​
679 int minColumn = d->openGLImageTextures->xToCol(ir.left()); 725​ int minColumn = d->openGLImageTextures->xToCol(ir.left());
680 int maxColumn = d->openGLImageTextures->xToCol(ir.right()); 726​ int maxColumn = d->openGLImageTextures->xToCol(ir.right());
681 int minRow = d->openGLImageTextures->yToRow(ir.top()); 727​ int minRow = d->openGLImageTextures->yToRow(ir.top());
Context not available.
689 735​
690 int effectiveCol = col; 736​ int effectiveCol = col;
691 int effectiveRow = row; 737​ int effectiveRow = row;
738​
692 QPointF tileWrappingTranslation; 739​ QPointF tileWrappingTranslation;
693 740​
694 if (effectiveCol > maxColumn || effectiveCol < minColumn) { 741​ if (effectiveCol > maxColumn || effectiveCol < minColumn) {
Context not available.
831 update(); 878​ update();
832} 879​}
833 880​
881​void KisOpenGLCanvas2::slotWraparoundModeChanged()
882​{
883​ KisConfig cfg(true);
884​
885​ d->isHorizontalWrapAround = cfg.wraparoundModeHorizontalEnabled();
886​ d->isVerticalWrapAround = cfg.wraparoundModeVerticalEnabled();
887​
888​ update();
889​}
890​
834QVariant KisOpenGLCanvas2::inputMethodQuery(Qt::InputMethodQuery query) const 891​QVariant KisOpenGLCanvas2::inputMethodQuery(Qt::InputMethodQuery query) const
835{ 892​{
836 return processInputMethodQuery(query); 893​ return processInputMethodQuery(query);
Context not available.