yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor getters in OutputScreens

Browse source 
Summary:
kdelibs coding style recommends to avoid abbreviations, i.e. variable
names like compMngr, errStr, and so on are bad. Unfortunately, all
getters in OutputScreens don't follow that recommendation. In general,
we could address this issue by renaming enOuts but there is a bit simpler
approach to implement most of those getters.

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: apol, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D20588
This commit is contained in:
Vlad Zagorodniy 2019-04-16 00:31:12 +03:00
parent aa11e4f777
commit 70b9c3651a
2 changed files with 37 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
outputscreens.cpp
View file

@ -41,74 +41,66 @@ void OutputScreens::init()
QString OutputScreens::name(int screen) const
{
const auto enOuts = m_platform->enabledOutputs();
if (screen >= enOuts.size()) {
return Screens::name(screen);
if (AbstractOutput *output = findOutput(screen)) {
return output->name();
}
return enOuts.at(screen)->name();
return QString();
}
bool OutputScreens::isInternal(int screen) const
{
const auto enOuts = m_platform->enabledOutputs();
if (screen >= enOuts.size()) {
return false;
if (AbstractOutput *output = findOutput(screen)) {
return output->isInternal();
}
return enOuts.at(screen)->isInternal();
return false;
}
QRect OutputScreens::geometry(int screen) const
{
const auto enOuts = m_platform->enabledOutputs();
if (screen >= enOuts.size()) {
return QRect();
if (AbstractOutput *output = findOutput(screen)) {
return output->geometry();
}
return enOuts.at(screen)->geometry();
return QRect();
}
QSize OutputScreens::size(int screen) const
{
const auto enOuts = m_platform->enabledOutputs();
if (screen >= enOuts.size()) {
return QSize();
if (AbstractOutput *output = findOutput(screen)) {
return output->geometry().size();
}
return enOuts.at(screen)->geometry().size();
return QSize();
}
qreal OutputScreens::scale(int screen) const
{
const auto enOuts = m_platform->enabledOutputs();
if (screen >= enOuts.size()) {
return 1;
if (AbstractOutput *output = findOutput(screen)) {
return output->scale();
}
return enOuts.at(screen)->scale();
return 1.0;
}
QSizeF OutputScreens::physicalSize(int screen) const
{
const auto enOuts = m_platform->enabledOutputs();
if (screen >= enOuts.size()) {
return Screens::physicalSize(screen);
if (AbstractOutput *output = findOutput(screen)) {
return output->physicalSize();
}
return enOuts.at(screen)->physicalSize();
return QSizeF();
}
float OutputScreens::refreshRate(int screen) const
{
const auto enOuts = m_platform->enabledOutputs();
if (screen >= enOuts.size()) {
return Screens::refreshRate(screen);
if (AbstractOutput *output = findOutput(screen)) {
return output->refreshRate() / 1000.0;
}
return enOuts.at(screen)->refreshRate() / 1000.0f;
return 60.0;
}
Qt::ScreenOrientation OutputScreens::orientation(int screen) const
{
const auto enOuts = m_platform->enabledOutputs();
if (screen >= enOuts.size()) {
return Qt::PrimaryOrientation;
if (AbstractOutput *output = findOutput(screen)) {
return output->orientation();
}
return enOuts.at(screen)->orientation();
return Qt::PrimaryOrientation;
}
void OutputScreens::updateCount()
@ -120,9 +112,9 @@ int OutputScreens::number(const QPoint &pos) const
{
int bestScreen = 0;
int minDistance = INT_MAX;
const auto enOuts = m_platform->enabledOutputs();
for (int i = 0; i < enOuts.size(); ++i) {
const QRect &geo = enOuts.at(i)->geometry();
const auto outputs = m_platform->enabledOutputs();
for (int i = 0; i < outputs.size(); ++i) {
const QRect &geo = outputs[i]->geometry();
if (geo.contains(pos)) {
return i;
}
@ -138,4 +130,9 @@ int OutputScreens::number(const QPoint &pos) const
return bestScreen;
}
AbstractOutput *OutputScreens::findOutput(int screen) const
{
return m_platform->enabledOutputs().value(screen);
}
} // namespace

5
outputscreens.h
View file

@ -25,6 +25,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace KWin
{
class AbstractOutput;
/**
* @brief Implementation for backends with Outputs
**/
@ -49,6 +51,9 @@ public:
protected:
Platform *m_platform;
private:
AbstractOutput *findOutput(int screen) const;
};
}