[Git][freetype/freetype-demos][gsoc-2022-chariri-final] 2 commits: * src/ftinspect/engine/stringrenderer.cpp: Fix infinite loop.

[Charlie Jiang (@cqjjjzr)]

Charlie Jiang pushed to branch gsoc-2022-chariri-final at FreeType / FreeType Demo Programs

Commits:

• 31b32fea
  by Charlie Jiang at 2022-09-05T15:57:44+08:00

  * src/ftinspect/engine/stringrenderer.cpp: Fix infinite loop.
  
  Don't limit the glyph position and exit too early, or the loop in `render`
  function won't stop forever. Also, since the string can be moved by the
  mouse, there's no point to limit the line position in the canvas viewport..
  

• e5312d07
  by Charlie Jiang at 2022-09-05T16:01:33+08:00

  * src/ftinspect/panels/settingpanelmmgx.cpp: Fix layout.
  
  Load a MM/GX font and switch to MM/GX tab in the left panel, then switch to
  the comparator tab, the setting panels below will be abnormally tall due to
  the updated MM/GX axes info loaded the panel with MM/GX axis widgets. This
  commit fixes the issue.
  

2 changed files:

• src/ftinspect/engine/stringrenderer.cpp
• src/ftinspect/panels/settingpanelmmgx.cpp

Changes:

src/ftinspect/engine/stringrenderer.cpp

---

...	...	@@ -522,9 +522,6 @@ StringRenderer::renderLine(int x,
522	522	int offset,
523	523	bool handleMultiLine)
524	524	{
525		- if (x < 0 || y < 0 || x > width || y > height)
526		- return 0;
527		-
528	525	y = height - y; // change to Cartesian coordinates
529	526
530	527	FT_Vector pen = { 0, 0 };

src/ftinspect/panels/settingpanelmmgx.cpp

---

...	...	@@ -95,6 +95,7 @@ SettingPanelMMGX::createLayout()
95	95	itemsListWidget_ = new QWidget(this);
96	96	scrollArea_ = new UnboundScrollArea(this);
97	97
	98	+ scrollArea_->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);
98	99	scrollArea_->setWidget(itemsListWidget_);
99	100	scrollArea_->setWidgetResizable(true);
100	101	itemsListWidget_->setAutoFillBackground(false);

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help