Commit e63b1de2 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Fix some EBN issues

parent a7484d2c
...@@ -41,7 +41,7 @@ namespace { ...@@ -41,7 +41,7 @@ namespace {
// If the icon size changes, a longer delay is used. This prevents that // If the icon size changes, a longer delay is used. This prevents that
// the expensive re-generation of all previews is triggered repeatedly when // the expensive re-generation of all previews is triggered repeatedly when
// chaning the zoom level. // changing the zoom level.
const int LongInterval = 300; const int LongInterval = 300;
} }
......
...@@ -1121,7 +1121,7 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges) ...@@ -1121,7 +1121,7 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges)
const int firstRemovedIndex = index; const int firstRemovedIndex = index;
const int lastRemovedIndex = index + count - 1; const int lastRemovedIndex = index + count - 1;
// Remeber which items have to be moved because they are behind the removed range. // Remember which items have to be moved because they are behind the removed range.
QVector<int> itemsToMove; QVector<int> itemsToMove;
// Remove all KItemListWidget instances that got deleted // Remove all KItemListWidget instances that got deleted
...@@ -2437,7 +2437,7 @@ int KItemListView::showDropIndicator(const QPointF& pos) ...@@ -2437,7 +2437,7 @@ int KItemListView::showDropIndicator(const QPointF& pos)
if (mappedPos.y() >= 0 && mappedPos.y() <= rect.height()) { if (mappedPos.y() >= 0 && mappedPos.y() <= rect.height()) {
if (m_model->supportsDropping(widget->index())) { if (m_model->supportsDropping(widget->index())) {
// Keep 30% of the rectangle as the gap instead of always having a fixed gap // Keep 30% of the rectangle as the gap instead of always having a fixed gap
const int gap = qMax(4.0, 0.3 * rect.height()); const int gap = qMax(qreal(4.0), qreal(0.3) * rect.height());
if (mappedPos.y() >= gap && mappedPos.y() <= rect.height() - gap) { if (mappedPos.y() >= gap && mappedPos.y() <= rect.height() - gap) {
return -1; return -1;
} }
......
...@@ -642,7 +642,7 @@ private: ...@@ -642,7 +642,7 @@ private:
/** /**
* Shows a drop-indicator between items dependent on the given * Shows a drop-indicator between items dependent on the given
* cursor position. The cursor position is relative the the upper left * cursor position. The cursor position is relative to the upper left
* edge of the view. * edge of the view.
* @return Index of the item where the dropping is done. An index of -1 * @return Index of the item where the dropping is done. An index of -1
* indicates that the item has been dropped after the last item. * indicates that the item has been dropped after the last item.
......
...@@ -89,4 +89,4 @@ private: ...@@ -89,4 +89,4 @@ private:
// to get all watched directories. // to get all watched directories.
}; };
#endif #endif
\ No newline at end of file
...@@ -81,4 +81,4 @@ ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& plugin ...@@ -81,4 +81,4 @@ ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& plugin
auto okButton = buttonBox->button(QDialogButtonBox::Ok); auto okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return); okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
okButton->setDefault(true); okButton->setDefault(true);
} }
\ No newline at end of file
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#include <QLabel> #include <QLabel>
#include <QPushButton> #include <QPushButton>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QVBoxLayout>
#include <QFileDialog> #include <QFileDialog>
#include "views/dolphinview.h" #include "views/dolphinview.h"
......
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
#include <KIO/PasteJob> #include <KIO/PasteJob>
#include <KIO/Paste> #include <KIO/Paste>
#include <KJob> #include <KJob>
#include <QMenu>
#include <KMessageBox> #include <KMessageBox>
#include <KJobWidgets> #include <KJobWidgets>
#include <QUrl> #include <QUrl>
......
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