Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cmake_minimum_required(VERSION 3.0.0)
project(SwipeView VERSION 0.1.0 LANGUAGES C CXX)

add_subdirectory(QSwipeView)
add_subdirectory(examples)
20 changes: 20 additions & 0 deletions QSwipeView/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)

add_library(qswipeview
qswipeview.cpp
qcompositeswipeview.cpp
qcompositeswipeview_priv.cpp
qpageindicator.cpp
)

target_include_directories(qswipeview PUBLIC ./)
target_link_libraries(qswipeview PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
2 changes: 1 addition & 1 deletion QSwipeView/qcompositeswipeview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ int QCompositeSwipeView::currentIndex() const {
return ui->swipeView->currentIndex();
}

int QCompositeSwipeView::indexOf(const QWidget *w) const {
int QCompositeSwipeView::indexOf(QWidget *w) const {
return ui->swipeView->indexOf(w);
}

Expand Down
2 changes: 1 addition & 1 deletion QSwipeView/qcompositeswipeview.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class QCompositeSwipeView : public QWidget {
QWidget *currentWidget() const;
int currentIndex() const;

int indexOf(const QWidget *) const;
int indexOf(QWidget *) const;
QWidget *widget(int) const;
int count() const;

Expand Down
4 changes: 4 additions & 0 deletions QSwipeView/qswipeview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,11 @@ void QSwipeView::mouseReleaseEvent(QMouseEvent *event)
const int end = m_swipeVertical ? movePos.y() : movePos.x();
const int distance = end - begin;
const int minDistance = minSwipeDistance();
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
const int velocity = m_swipeVertical ? event->point(event->pointCount() - 1).velocity().y() : event->point(event->pointCount() - 1).velocity().x();
#else
const int velocity = 0;
#endif
const int minVelocity = swipeVelocity();
const int frameWidth = frameRect().width();
const int frameHeight = frameRect().height();
Expand Down
5 changes: 5 additions & 0 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
add_subdirectory(composite-test)
add_subdirectory(demo)
add_subdirectory(qswipeviewplugin)
add_subdirectory(swipeview-test)
add_subdirectory(vertical-test)
16 changes: 16 additions & 0 deletions examples/composite-test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)

add_executable(composite-test
main.cpp
)

target_link_libraries(composite-test PRIVATE Qt${QT_VERSION_MAJOR}::Widgets qswipeview)
18 changes: 18 additions & 0 deletions examples/demo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@

set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)

add_executable(demo
main.cpp
demo.cpp
demo.ui
)

target_link_libraries(demo PRIVATE Qt${QT_VERSION_MAJOR}::Widgets qswipeview)
5 changes: 4 additions & 1 deletion examples/examples.pro
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ SUBDIRS += demo
SUBDIRS += qswipeviewplugin
SUBDIRS += swipeview-test
SUBDIRS += vertical-test
SUBDIRS += xdg-app-launcher

linux {
SUBDIRS += xdg-app-launcher
}
25 changes: 25 additions & 0 deletions examples/qswipeviewplugin/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)

add_library(qswipeviewplugin
qswipeviewplugin.cpp
qpageindicatorplugin.cpp
)

target_link_libraries(qswipeviewplugin PRIVATE Qt${QT_VERSION_MAJOR}::Widgets qswipeview)

# TODO PRO resources ==> cmake resources ???
# resources.files = \
# images/icons8-swipe-64.png \
# images/icons8-dots-loading-64.png
# resources.prefix = /

# RESOURCES = resources
16 changes: 16 additions & 0 deletions examples/swipeview-test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)

add_executable(swipeview-test
main.cpp
)

target_link_libraries(swipeview-test PRIVATE Qt${QT_VERSION_MAJOR}::Widgets qswipeview)
16 changes: 16 additions & 0 deletions examples/vertical-test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)

add_executable(vertical-test
main.cpp
)

target_link_libraries(vertical-test PRIVATE Qt${QT_VERSION_MAJOR}::Widgets qswipeview)