Changeset View
Changeset View
Standalone View
Standalone View
lib/documentview/svgviewadapter.cpp
Show First 20 Lines • Show All 60 Lines • ▼ Show 20 Line(s) | |||||
61 | 61 | | |||
62 | void SvgImageView::finishLoadFromDocument() | 62 | void SvgImageView::finishLoadFromDocument() | ||
63 | { | 63 | { | ||
64 | QSvgRenderer* renderer = document()->svgRenderer(); | 64 | QSvgRenderer* renderer = document()->svgRenderer(); | ||
65 | GV_RETURN_IF_FAIL(renderer); | 65 | GV_RETURN_IF_FAIL(renderer); | ||
66 | mSvgItem->setSharedRenderer(renderer); | 66 | mSvgItem->setSharedRenderer(renderer); | ||
67 | if (zoomToFit()) { | 67 | if (zoomToFit()) { | ||
68 | setZoom(computeZoomToFit(), QPointF(-1, -1), ForceUpdate); | 68 | setZoom(computeZoomToFit(), QPointF(-1, -1), ForceUpdate); | ||
69 | } else if (zoomToFitWidth()) { | 69 | } else if (zoomToFill()) { | ||
70 | setZoom(computeZoomToFitWidth(), QPointF(-1, -1), ForceUpdate); | 70 | setZoom(computeZoomToFill(), QPointF(-1, -1), ForceUpdate); | ||
71 | } else { | 71 | } else { | ||
72 | mSvgItem->setScale(zoom()); | 72 | mSvgItem->setScale(zoom()); | ||
73 | } | 73 | } | ||
74 | applyPendingScrollPos(); | 74 | applyPendingScrollPos(); | ||
75 | completed(); | 75 | completed(); | ||
76 | } | 76 | } | ||
77 | 77 | | |||
78 | void SvgImageView::onZoomChanged() | 78 | void SvgImageView::onZoomChanged() | ||
Show All 25 Lines | |||||
104 | 104 | | |||
105 | SvgViewAdapter::SvgViewAdapter() | 105 | SvgViewAdapter::SvgViewAdapter() | ||
106 | : d(new SvgViewAdapterPrivate) | 106 | : d(new SvgViewAdapterPrivate) | ||
107 | { | 107 | { | ||
108 | d->mView = new SvgImageView; | 108 | d->mView = new SvgImageView; | ||
109 | setWidget(d->mView); | 109 | setWidget(d->mView); | ||
110 | connect(d->mView, &SvgImageView::zoomChanged, this, &SvgViewAdapter::zoomChanged); | 110 | connect(d->mView, &SvgImageView::zoomChanged, this, &SvgViewAdapter::zoomChanged); | ||
111 | connect(d->mView, &SvgImageView::zoomToFitChanged, this, &SvgViewAdapter::zoomToFitChanged); | 111 | connect(d->mView, &SvgImageView::zoomToFitChanged, this, &SvgViewAdapter::zoomToFitChanged); | ||
112 | connect(d->mView, &SvgImageView::zoomToFitWidthChanged, this, &SvgViewAdapter::zoomToFitWidthChanged); | 112 | connect(d->mView, &SvgImageView::zoomToFillChanged, this, &SvgViewAdapter::zoomToFillChanged); | ||
113 | connect(d->mView, &SvgImageView::zoomInRequested, this, &SvgViewAdapter::zoomInRequested); | 113 | connect(d->mView, &SvgImageView::zoomInRequested, this, &SvgViewAdapter::zoomInRequested); | ||
114 | connect(d->mView, &SvgImageView::zoomOutRequested, this, &SvgViewAdapter::zoomOutRequested); | 114 | connect(d->mView, &SvgImageView::zoomOutRequested, this, &SvgViewAdapter::zoomOutRequested); | ||
115 | connect(d->mView, &SvgImageView::scrollPosChanged, this, &SvgViewAdapter::scrollPosChanged); | 115 | connect(d->mView, &SvgImageView::scrollPosChanged, this, &SvgViewAdapter::scrollPosChanged); | ||
116 | connect(d->mView, &SvgImageView::completed, this, &SvgViewAdapter::completed); | 116 | connect(d->mView, &SvgImageView::completed, this, &SvgViewAdapter::completed); | ||
117 | connect(d->mView, &SvgImageView::previousImageRequested, this, &SvgViewAdapter::previousImageRequested); | 117 | connect(d->mView, &SvgImageView::previousImageRequested, this, &SvgViewAdapter::previousImageRequested); | ||
118 | connect(d->mView, &SvgImageView::nextImageRequested, this, &SvgViewAdapter::nextImageRequested); | 118 | connect(d->mView, &SvgImageView::nextImageRequested, this, &SvgViewAdapter::nextImageRequested); | ||
119 | connect(d->mView, &SvgImageView::toggleFullScreenRequested, this, &SvgViewAdapter::toggleFullScreenRequested); | 119 | connect(d->mView, &SvgImageView::toggleFullScreenRequested, this, &SvgViewAdapter::toggleFullScreenRequested); | ||
120 | } | 120 | } | ||
Show All 23 Lines | 143 | { | |||
144 | return d->mView->document(); | 144 | return d->mView->document(); | ||
145 | } | 145 | } | ||
146 | 146 | | |||
147 | void SvgViewAdapter::setZoomToFit(bool on) | 147 | void SvgViewAdapter::setZoomToFit(bool on) | ||
148 | { | 148 | { | ||
149 | d->mView->setZoomToFit(on); | 149 | d->mView->setZoomToFit(on); | ||
150 | } | 150 | } | ||
151 | 151 | | |||
152 | void SvgViewAdapter::setZoomToFitWidth(bool on) | 152 | void SvgViewAdapter::setZoomToFill(bool on) | ||
153 | { | 153 | { | ||
154 | d->mView->setZoomToFitWidth(on); | 154 | d->mView->setZoomToFill(on); | ||
155 | } | 155 | } | ||
156 | 156 | | |||
157 | bool SvgViewAdapter::zoomToFit() const | 157 | bool SvgViewAdapter::zoomToFit() const | ||
158 | { | 158 | { | ||
159 | return d->mView->zoomToFit(); | 159 | return d->mView->zoomToFit(); | ||
160 | } | 160 | } | ||
161 | 161 | | |||
162 | bool SvgViewAdapter::zoomToFitWidth() const | 162 | bool SvgViewAdapter::zoomToFill() const | ||
163 | { | 163 | { | ||
164 | return d->mView->zoomToFitWidth(); | 164 | return d->mView->zoomToFill(); | ||
165 | } | 165 | } | ||
166 | 166 | | |||
167 | qreal SvgViewAdapter::zoom() const | 167 | qreal SvgViewAdapter::zoom() const | ||
168 | { | 168 | { | ||
169 | return d->mView->zoom(); | 169 | return d->mView->zoom(); | ||
170 | } | 170 | } | ||
171 | 171 | | |||
172 | void SvgViewAdapter::setZoom(qreal zoom, const QPointF& center) | 172 | void SvgViewAdapter::setZoom(qreal zoom, const QPointF& center) | ||
173 | { | 173 | { | ||
174 | d->mView->setZoom(zoom, center); | 174 | d->mView->setZoom(zoom, center); | ||
175 | } | 175 | } | ||
176 | 176 | | |||
177 | qreal SvgViewAdapter::computeZoomToFit() const | 177 | qreal SvgViewAdapter::computeZoomToFit() const | ||
178 | { | 178 | { | ||
179 | return d->mView->computeZoomToFit(); | 179 | return d->mView->computeZoomToFit(); | ||
180 | } | 180 | } | ||
181 | 181 | | |||
182 | qreal SvgViewAdapter::computeZoomToFitWidth() const | 182 | qreal SvgViewAdapter::computeZoomToFill() const | ||
183 | { | 183 | { | ||
184 | return d->mView->computeZoomToFitWidth(); | 184 | return d->mView->computeZoomToFill(); | ||
185 | } | 185 | } | ||
186 | 186 | | |||
187 | QPointF SvgViewAdapter::scrollPos() const | 187 | QPointF SvgViewAdapter::scrollPos() const | ||
188 | { | 188 | { | ||
189 | return d->mView->scrollPos(); | 189 | return d->mView->scrollPos(); | ||
190 | } | 190 | } | ||
191 | 191 | | |||
192 | void SvgViewAdapter::setScrollPos(const QPointF& pos) | 192 | void SvgViewAdapter::setScrollPos(const QPointF& pos) | ||
193 | { | 193 | { | ||
194 | d->mView->setScrollPos(pos); | 194 | d->mView->setScrollPos(pos); | ||
195 | } | 195 | } | ||
196 | 196 | | |||
197 | } // namespace | 197 | } // namespace |