diff --git a/cockatrice/resources/config/qtlogging.ini b/cockatrice/resources/config/qtlogging.ini index 5404c96fb..43dea5f2b 100644 --- a/cockatrice/resources/config/qtlogging.ini +++ b/cockatrice/resources/config/qtlogging.ini @@ -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 diff --git a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp index 28a20095b..2fefba34b 100644 --- a/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/cards/deck_card_zone_display_widget.cpp @@ -25,7 +25,7 @@ void DeckCardZoneDisplayWidget::resizeEvent(QResizeEvent *event) for (QObject *child : layout->children()) { QWidget *widget = qobject_cast(child); if (widget) { - widget->resize(event->size()); + widget->setMaximumWidth(width()); } } } diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index 9d66afbe3..9b7874796 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -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 =