jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-15 06:52:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Finally fix the freaking OverlapLayout.

Browse source
This commit is contained in:
Lukas Brübach 2025-02-11 20:39:04 +01:00
parent c10165dfbe
commit 80259a34e7
3 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
cockatrice/resources/config/qtlogging.ini
View file

@ -5,13 +5,16 @@
# Uncomment a rule to disable logging for that category,
# or set .debug = true for that category to see debug level logs
# main = false
# qt_translator = false
# window_main.* = false
# release_channel = false
# spoiler_background_updater = false
# theme_manager = false
# sound_engine = false
flow_layout = false
flow_widget.* = false
# main = true
qt_translator = false
window_main.* = false
release_channel = false
spoiler_background_updater = false
theme_manager = false
sound_engine = false
# tapped_out_interface = false
# tab_game = false
@ -37,15 +40,15 @@
# user_info_connection = false
# picture_loader = false
# picture_loader.worker = false
# picture_loader.card_back_cache_fail = false
# picture_loader.picture_to_load = false
picture_loader = false
picture_loader.worker = false
picture_loader.card_back_cache_fail = false
picture_loader.picture_to_load = false
# deck_loader = false
# card_database = false
# card_database.loading = false
# card_database.loading.success_or_failure = false
# cockatrice_xml.* = false
card_database.loading = false
card_database.loading.success_or_failure = true
cockatrice_xml.* = false
# cockatrice_xml.xml_3_parser = false
# cockatrice_xml.xml_4_parser = false
# card_info = false
@ -57,6 +60,8 @@
# card_info_picture_widget = false
overlap_layout.debug = false
# pixel_map_generator = false
# filter_string = false

2
cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp
View file

@ -25,7 +25,7 @@ void DeckCardZoneDisplayWidget::resizeEvent(QResizeEvent *event)
for (QObject *child : layout->children()) {
QWidget *widget = qobject_cast<QWidget *>(child);
if (widget) {
widget->resize(event->size());
widget->setMaximumWidth(width());
}
}
}

1
cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp
View file

@ -89,6 +89,7 @@ void VisualDeckEditorWidget::updateDisplay()
// Clear the layout first
populateCards();
zoneContainer = new QWidget(scrollArea);
zoneContainer->setMaximumWidth(scrollArea->viewport()->width());
zoneContainerLayout = new QVBoxLayout(zoneContainer);
DeckCardZoneDisplayWidget *mainBoardWidget =