mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-19 19:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into gl

Browse source
This commit is contained in:
Ani 2025-04-08 19:15:32 +02:00 • committed by GitHub
commit 13288378e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/Cell/PPUTranslator.cpp
View file

@ -4653,7 +4653,7 @@ void PPUTranslator::MTFSF(ppu_opcode_t op)
for (u32 i = 16; i < 20; i++)
{
if (op.flm & (128 >> (i / 4)) != 0)
if ((op.flm & (128 >> (i / 4))) != 0)
{
SetFPSCRBit(i, Trunc(m_ir->CreateLShr(value, i ^ 31), GetType<bool>()), false);
}

8
rpcs3/rpcs3qt/richtext_item_delegate.h
View file

@ -38,12 +38,7 @@ public:
// Adjust our painter parameters with some magic that looks good.
// This is necessary so that we don't draw on top of the optional widget.
// If you're not happy with this code don't hesitate to contact Megamouse
#ifdef __linux__
static constexpr int margin_adjustement = 12;
#else
static constexpr int margin_adjustement = 4;
#endif
const int margin = (option.rect.height() - opt.fontMetrics.height() - margin_adjustement);
QRect text_rect = style->subElementRect(QStyle::SE_ItemViewItemText, &opt, nullptr);
@ -56,10 +51,7 @@ public:
text_rect.setTop(text_rect.top() + margin);
painter->translate(text_rect.topLeft());
#ifndef __linux__
painter->setClipRect(text_rect.translated(-text_rect.topLeft()));
#endif
// Create a context for our painter
QAbstractTextDocumentLayout::PaintContext context;