~canonical-dx-team/unity/unity.fix-ql-losing-focus

« back to all changes in this revision

Viewing changes to src/StaticCairoText.cpp

Committer: Jay Taoko
Date: 2011-02-27 08:25:15 UTC
mfrom: (884.3.1 unity.scrolling-improvements)
mto: (894.1.8 dash-fixes-2011-02-28)
mto: This revision was merged to the branch mainline in revision 895.
Revision ID: jay.taoko@canonical.com-20110227082515-vgjqwdyh2ubvye1b

Merge

files modified:
CMakeLists.txt

services/CMakeLists.txt

services/panel-a11y.c

src/DeviceLauncherIcon.cpp

src/IconTexture.cpp

src/Launcher.cpp

src/Launcher.h

src/LauncherIcon.cpp

src/LauncherIcon.h

src/PanelIndicatorObjectEntryView.cpp

src/PanelStyle.cpp

src/PanelStyle.h

src/PlaceEntry.h

src/PlaceEntryHome.cpp

src/PlaceEntryHome.h

src/PlaceEntryRemote.cpp

src/PlaceEntryRemote.h

src/PlacesGroup.cpp

src/PlacesGroup.h

src/PlacesResultsController.cpp

src/PlacesResultsController.h

src/PlacesResultsView.cpp

src/PlacesSearchBar.cpp

src/PlacesSearchBar.h

src/PlacesView.cpp

src/StaticCairoText.cpp

src/StaticCairoText.h

src/unitya11y.cpp

tools/autopilot.py

Show diffs side-by-side

added added

removed removed

src/StaticCairoText.cpp

162

gfxContext.GetRenderStates ().GetBlend (alpha, src, dest);

163

gfxContext.GetRenderStates ().SetBlend (true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);

164

165

Color col = Color::Black;

166

col.SetAlpha (0.0f);

167

gfxContext.QRP_Color (base.x,

168

base.y,

169

base.width,

170

base.height,

171

col);

172

165

173

gfxContext.QRP_1Tex (base.x,

166

base.y,

167

base.width,

168

base.height,

169

_texture2D->GetDeviceTexture(),

170

texxform,

171

_textColor);

174

base.y + ((base.height - _cached_extent_height)/2),

175

base.width,

176

base.height,

177

_texture2D->GetDeviceTexture(),

178

texxform,

179

_textColor);

172

180

173

181

gfxContext.GetRenderStates ().SetBlend (alpha, src, dest);

174

182

223

231

int width = 0;

224

232

int height = 0;

225

233

GetTextExtents (width, height);

234

SetMinimumHeight (height);

226

235

NeedRedraw ();

227

236

sigFontChanged.emit (this);

228

237

}

Older »