3 files changed, 1 insertions, 88 deletions

diff --git a/src/ui/model/GpgKeyTableProxyModel.cpp b/src/ui/model/GpgKeyTableProxyModel.cpp
index 5fa5bea4..9dc98bcd 100644
--- a/src/ui/model/GpgKeyTableProxyModel.cpp
+++ b/src/ui/model/GpgKeyTableProxyModel.cpp
@@ -198,80 +198,4 @@ void GpgKeyTableProxyModel::slot_update_favorites_cache() {
   }
 }
 
-auto GpgKeyTableProxyModel::data(const QModelIndex &index,
-                                 int role) const -> QVariant {
-  if (role == Qt::FontRole) {
-    return default_font_;
-  }
-
-  if (role == Qt::TextAlignmentRole) {
-    return Qt::AlignCenter;
-  }
-
-  if (role == Qt::SizeHintRole) {
-    const QVariant display_data = model_->data(index, Qt::DisplayRole);
-    if (!display_data.isValid()) {
-      return {};
-    }
-
-    const QString text = display_data.toString();
-
-    QRect rect = default_metrics_.boundingRect(QRect{}, Qt::AlignCenter, text);
-
-    const int horizontal_padding = 15;
-    const int vertical_padding = 2;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
-    const int raw_width = default_metrics_.horizontalAdvance(text);
-#else
-    const int raw_width = rect.width();
-#endif
-
-    const int width =
-        static_cast<int>(raw_width * 1.15) + horizontal_padding * 2;
-    const int height = rect.height() + vertical_padding * 2;
-
-    LOG_D() << "row text: " << text << "width: " << width;
-
-    return QSize(width, height);
-  }
-
-  return sourceModel()->data(index, role);
-}
-
-auto GpgKeyTableProxyModel::headerData(int section, Qt::Orientation orientation,
-                                       int role) const -> QVariant {
-  if (role == Qt::FontRole) {
-    return default_font_;
-  }
-
-  if (role == Qt::SizeHintRole) {
-    const QVariant display_data =
-        model_->headerData(section, orientation, Qt::DisplayRole);
-    if (!display_data.isValid()) {
-      return {};
-    }
-
-    const QString text = display_data.toString();
-
-    QRect rect = default_metrics_.boundingRect(QRect{}, Qt::AlignCenter, text);
-
-    const int horizontal_padding = 15;
-    const int vertical_padding = 2;
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
-    const int raw_width = default_metrics_.horizontalAdvance(text);
-#else
-    const int raw_width = rect.width();
-#endif
-
-    const int width =
-        static_cast<int>(raw_width * 1.15) + horizontal_padding * 2;
-    const int height = rect.height() + vertical_padding * 2;
-
-    return QSize(width, height);
-  }
-
-  return sourceModel()->headerData(section, orientation, role);
-}
 }  // namespace GpgFrontend::UI
\ No newline at end of file
diff --git a/src/ui/model/GpgKeyTableProxyModel.h b/src/ui/model/GpgKeyTableProxyModel.h
index 44ceee45..dd086ba9 100644
--- a/src/ui/model/GpgKeyTableProxyModel.h
+++ b/src/ui/model/GpgKeyTableProxyModel.h
@@ -49,12 +49,6 @@ class GpgKeyTableProxyModel : public QSortFilterProxyModel {
 
   void ResetGpgKeyTableModel(QSharedPointer<GpgKeyTableModel> model);
 
-  [[nodiscard]] auto data(const QModelIndex &index,
-                          int role) const -> QVariant override;
-
-  [[nodiscard]] auto headerData(int section, Qt::Orientation orientation,
-                                int role) const -> QVariant override;
-
  protected:
   [[nodiscard]] auto filterAcceptsRow(
       int sourceRow, const QModelIndex &sourceParent) const -> bool override;
diff --git a/src/ui/widgets/KeyTable.cpp b/src/ui/widgets/KeyTable.cpp
index 6fe2d966..542382cf 100644
--- a/src/ui/widgets/KeyTable.cpp
+++ b/src/ui/widgets/KeyTable.cpp
@@ -54,8 +54,7 @@ KeyTable::KeyTable(QWidget* parent, QSharedPointer<GpgKeyTableModel> model,
 
   verticalHeader()->hide();
   horizontalHeader()->setStretchLastSection(false);
-  horizontalHeader()->setResizeContentsPrecision(1000);
-
+  horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
   setShowGrid(false);
   sortByColumn(2, Qt::AscendingOrder);
   setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -68,10 +67,6 @@ KeyTable::KeyTable(QWidget* parent, QSharedPointer<GpgKeyTableModel> model,
   setAlternatingRowColors(true);
   setSortingEnabled(true);
 
-  for (int i = 1; i < proxy_model_.columnCount(); ++i) {
-    this->resizeColumnToContents(i);
-  }
-
   connect(CommonUtils::GetInstance(), &CommonUtils::SignalFavoritesChanged,
           &proxy_model_, &GpgKeyTableProxyModel::SignalFavoritesChanged);
   connect(this, &KeyTable::SignalColumnTypeChange, this,