comparison Framework/Scene2D/Internals/OpenGLTextProgram.cpp @ 699:5c551f078c18 refactor-viewport-controller

Merge from default
author Benjamin Golinvaux <bgo@osimis.io>
date Fri, 17 May 2019 09:20:46 +0200
parents 8b6adfb62a2f 9a474e90e832
children 61ba4b504e9a
comparison
equal deleted inserted replaced
698:8b6adfb62a2f 699:5c551f078c18
153 { 153 {
154 context_.MakeCurrent(); 154 context_.MakeCurrent();
155 program_->Use(); 155 program_->Use();
156 156
157 double dx, dy; // In pixels 157 double dx, dy; // In pixels
158 ComputeAnchorTranslation(dx, dy, data.GetAnchor(), data.GetTextWidth(), 158 ComputeAnchorTranslation(dx, dy, data.GetAnchor(),
159 data.GetTextHeight(), static_cast<unsigned int>(data.GetBorder())); 159 data.GetTextWidth(), data.GetTextHeight(),
160 static_cast<unsigned int>(data.GetBorder()));
160 161
161 double x = data.GetX(); 162 double x = data.GetX();
162 double y = data.GetY(); 163 double y = data.GetY();
163 transform.Apply(x, y); 164 transform.Apply(x, y);
164 165