diff --git a/src/core/input_manager.py b/src/core/input_manager.py index 9ca9d10..bf9eda7 100644 --- a/src/core/input_manager.py +++ b/src/core/input_manager.py @@ -410,8 +410,9 @@ def handle_mouse(self, x, y): dy_pet = y - center_y dist_sq_pet = dx_pet * dx_pet + dy_pet * dy_pet - # Оптимизация: сравнение квадрата расстояния (порог 60px -> 3600) - if dist_sq_pet < 3600: + # Динамическое масштабирование радиуса поглаживания на основе размера окна + pet_radius = max(self.window.width(), self.window.height()) * 0.6 + if dist_sq_pet < pet_radius * pet_radius: # Исключаем пассивный фарм (требуем активное поглаживание: активное движение мыши и кулдаун) if self.last_pet_time == 0: self.last_pet_mouse_pos = (x, y) diff --git a/src/ui/main_window.py b/src/ui/main_window.py index e619905..9c83d42 100644 --- a/src/ui/main_window.py +++ b/src/ui/main_window.py @@ -55,7 +55,8 @@ def __init__(self, config_manager=None): self.is_dragging = False self.shake_count = 0 self.last_shake_time = 0 - self.original_size = QSize(100, 100) + pet_size = self.config.get("pet_size") if self.config else 100 + self.original_size = QSize(pet_size, pet_size) # Начальный размер self.resize(self.original_size) @@ -91,6 +92,14 @@ def set_opacity(self, value): """Устанавливает прозрачность окна (0-100)""" self.setWindowOpacity(value / 100.0) + def set_pet_size(self, size_val): + """Динамически изменяет базовый размер питомца.""" + if self.config: + self.config.set("pet_size", size_val) + self.original_size = QSize(size_val, size_val) + self.resize(self.original_size) + self.animation_manager.update_size(self.size()) + def set_always_on_top(self, enabled): """Включает или выключает режим 'Поверх всех окон' динамически""" if self.config: diff --git a/src/ui/settings_dialog.py b/src/ui/settings_dialog.py index 5339824..f1d9378 100644 --- a/src/ui/settings_dialog.py +++ b/src/ui/settings_dialog.py @@ -52,6 +52,21 @@ def __init__(self, config, parent=None): self.opacity_slider.valueChanged.connect(lambda v: self.opacity_val_label.setText(f"{v}%")) layout.addWidget(self.opacity_slider) + # Размер питомца + size_header_layout = QHBoxLayout() + size_header_layout.addWidget(QLabel("Размер питомца:")) + self.size_val_label = QLabel(f"{self.config.get('pet_size')}px") + self.size_val_label.setStyleSheet("font-weight: bold; color: #555;") + size_header_layout.addStretch() + size_header_layout.addWidget(self.size_val_label) + layout.addLayout(size_header_layout) + + self.size_slider = QSlider(Qt.Horizontal) + self.size_slider.setRange(50, 250) + self.size_slider.setValue(self.config.get("pet_size")) + self.size_slider.valueChanged.connect(lambda v: self.size_val_label.setText(f"{v}px")) + layout.addWidget(self.size_slider) + # Интервал растяжки layout.addWidget(QLabel("Интервал растяжки (мин):")) self.stretch_spin = QSpinBox() @@ -168,6 +183,7 @@ def save_settings(self): self.config.set("always_on_top", self.always_on_top_check.isChecked()) self.config.set("volume", self.volume_slider.value()) self.config.set("opacity", self.opacity_slider.value()) + self.config.set("pet_size", self.size_slider.value()) self.config.set("stretch_interval", self.stretch_spin.value()) self.config.set("pomodoro_work", self.pomodoro_work_spin.value()) self.config.set("pomodoro_break", self.pomodoro_break_spin.value()) diff --git a/src/ui/tray_menu.py b/src/ui/tray_menu.py index b3d0392..0992f79 100644 --- a/src/ui/tray_menu.py +++ b/src/ui/tray_menu.py @@ -186,6 +186,7 @@ def show_settings(self, checked=False): # Обновляем скин и прозрачность в реальном времени self.window.animation_manager.set_skin(self.window.config.get("skin")) self.window.set_opacity(self.window.config.get("opacity")) + self.window.set_pet_size(self.window.config.get("pet_size")) # Обновляем меню скинов self.update_skin_menu() # Обновляем режим "Поверх всех окон" в реальном времени diff --git a/src/utils/config_manager.py b/src/utils/config_manager.py index e6ad878..fb39511 100644 --- a/src/utils/config_manager.py +++ b/src/utils/config_manager.py @@ -12,7 +12,8 @@ class ConfigManager: "volume": 70, "language": "ru", "skin": "default", - "opacity": 100 + "opacity": 100, + "pet_size": 100 } def __init__(self, config_path="settings.json"): diff --git a/tests/test_utils.py b/tests/test_utils.py index 1a72e44..c43324e 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -516,5 +516,55 @@ def test_stats_dialog_reset_ui_flow(self): QMessageBox.information = original_information db.close() + def test_pet_size_configuration_and_scaling(self): + os.environ["QT_QPA_PLATFORM"] = "offscreen" + from PySide6.QtWidgets import QApplication + app = QApplication.instance() or QApplication([]) + + config = ConfigManager(self.config_path) + + # 1. Default config value + self.assertEqual(config.get("pet_size"), 100) + + # 2. Window initialization with config value + config.set("pet_size", 150) + window = PetWindow(config) + self.assertEqual(window.original_size.width(), 150) + self.assertEqual(window.original_size.height(), 150) + self.assertEqual(window.width(), 150) + + # 3. Dynamic resizing via set_pet_size + window.set_pet_size(200) + self.assertEqual(window.original_size.width(), 200) + self.assertEqual(window.width(), 200) + self.assertEqual(config.get("pet_size"), 200) + + # 4. InputManager dynamic petting radius scaling test + mock_window = MagicMock() + mock_window.width.return_value = 200 + mock_window.height.return_value = 200 + mock_pos = MagicMock() + mock_pos.x.return_value = 100 + mock_pos.y.return_value = 100 + mock_window.get_cached_pos.return_value = mock_pos + + mock_cursor = MagicMock() + mock_cursor.pos.return_value = QPoint(100, 100) + mock_window.cursor.return_value = mock_cursor + mock_window.animation_manager.current_state = "idle" + + db = DataStore(self.db_path) + im = InputManager(mock_window, db) + + # Mouse outside dynamic radius + im.handle_mouse(350, 350) + self.assertEqual(im.last_pet_time, 0) + + # Mouse inside dynamic radius + im.handle_mouse(250, 250) + self.assertNotEqual(im.last_pet_time, 0) + + db.close() + if __name__ == '__main__': unittest.main() diff --git a/verification/screenshots/stats_history.png b/verification/screenshots/stats_history.png index 1fa59b4..8c83aa0 100644 Binary files a/verification/screenshots/stats_history.png and b/verification/screenshots/stats_history.png differ