Commit 74d2c212 authored by Andrius Štikonas's avatar Andrius Štikonas

Port away from KDELibs4Support.

parent 3e9c6bd2
......@@ -9,17 +9,16 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_D
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
CoreAddons
Config
Crash
I18n
ConfigWidgets
Completion
XmlGui
WidgetsAddons
CoreAddons
Crash
DNSSD
KDELibs4Support
DocTools
I18n
XmlGui
WidgetsAddons
)
find_package(KF5KDEGames 4.9.0 REQUIRED)
......
......@@ -46,7 +46,6 @@ target_link_libraries(kfourinline
KF5::DNSSD
KF5::XmlGui
KF5::WidgetsAddons
KF5::KDELibs4Support
KF5KDEGames
KF5KDEGamesPrivate
Qt5::Svg
......@@ -65,7 +64,7 @@ set(kwin4proc_SRCS
add_executable(kfourinlineproc ${kwin4proc_SRCS})
target_link_libraries(kfourinlineproc KF5::KDELibs4Support KF5KDEGames KF5KDEGamesPrivate Qt5::Svg)
target_link_libraries(kfourinlineproc KF5KDEGames KF5KDEGamesPrivate Qt5::Svg)
install(TARGETS kfourinlineproc ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
......
......@@ -47,7 +47,7 @@ ButtonSprite::ButtonSprite(bool pushButton, const QString &id, ThemeManager* the
mSignal = new SpriteNotify(this);
setAcceptedMouseButtons(Qt::NoButton);
setAcceptsHoverEvents(false);
setAcceptHoverEvents(false);
// Create sub sprites
mText = new QGraphicsTextItem(this);
......
......@@ -38,7 +38,7 @@ PixmapSprite::PixmapSprite(const QString &id, ThemeManager* theme, int no, QGrap
{
canvas->addItem(this);
hide();
setAcceptsHoverEvents(false);
setAcceptHoverEvents(false);
mAnimationState = Idle;
mNo = no;
......@@ -156,7 +156,7 @@ void PixmapSprite::changeTheme()
// Set theme offset (probably not really necesary here)
QPoint offset = thememanager()->getOffset();
resetTransform();
if (mOffsetStatus) translate(offset.x(), offset.y());
if (mOffsetStatus) setTransform(QTransform::fromTranslate(offset.x(), offset.y()), true);
// Set pixmap to sprite
setFrame(mCurrentFrame, true);
......@@ -236,11 +236,11 @@ void PixmapSprite::setFrame(int no, bool force)
resetTransform();
if (mOffsetStatus)
{
translate(-mHotspots.at(no).x()+offset.x(), -mHotspots.at(no).y()+offset.y());
setTransform(QTransform::fromTranslate(-mHotspots.at(no).x()+offset.x(), -mHotspots.at(no).y()+offset.y()), true);
}
else
{
translate(-mHotspots.at(no).x(), -mHotspots.at(no).y());
setTransform(QTransform::fromTranslate(-mHotspots.at(no).x(), -mHotspots.at(no).y()), true);
}
mCurrentFrame = no;
update();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment