Skip to content

Commit 65fe215

Browse files
lorenzgillnerlorenzgillner
authored
Unify scrollbar positioning (#447)
* Unify scrollbar positioning * Remove comments
1 parent 2350a67 commit 65fe215

File tree

2 files changed

+52
-27
lines changed

2 files changed

+52
-27
lines changed

‎resources/mintinstall.glade‎

Lines changed: 43 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,6 @@
253253
<object class="GtkBox" id="box_landing">
254254
<property name="visible">True</property>
255255
<property name="can-focus">False</property>
256-
<property name="margin-start">8</property>
257-
<property name="margin-end">8</property>
258-
<property name="margin-top">8</property>
259-
<property name="margin-bottom">8</property>
260256
<property name="orientation">vertical</property>
261257
<property name="spacing">6</property>
262258
<child>
@@ -280,13 +276,16 @@
280276
<object class="GtkBox" id="scroll_box">
281277
<property name="visible">True</property>
282278
<property name="can-focus">False</property>
279+
<property name="border-width">9</property>
283280
<property name="orientation">vertical</property>
284281
<child>
285282
<object class="GtkBox" id="box_banner">
286283
<property name="height-request">160</property>
287284
<property name="visible">True</property>
288285
<property name="can-focus">False</property>
289-
<property name="margin-right">10</property>
286+
<property name="margin-start">3</property>
287+
<property name="margin-end">3</property>
288+
<property name="margin-top">3</property>
290289
<property name="margin-bottom">8</property>
291290
<property name="orientation">vertical</property>
292291
<child>
@@ -329,7 +328,6 @@
329328
<object class="GtkBox" id="box_featured">
330329
<property name="visible">True</property>
331330
<property name="can-focus">False</property>
332-
<property name="margin-right">10</property>
333331
<property name="orientation">vertical</property>
334332
<child>
335333
<placeholder/>
@@ -378,7 +376,6 @@
378376
<object class="GtkBox" id="box_categories">
379377
<property name="visible">True</property>
380378
<property name="can-focus">False</property>
381-
<property name="margin-right">10</property>
382379
<property name="orientation">vertical</property>
383380
<child>
384381
<placeholder/>
@@ -427,7 +424,6 @@
427424
<object class="GtkBox" id="box_top_rated">
428425
<property name="visible">True</property>
429426
<property name="can-focus">False</property>
430-
<property name="margin-right">10</property>
431427
<property name="orientation">vertical</property>
432428
<child>
433429
<placeholder/>
@@ -474,23 +470,43 @@
474470
<object class="GtkBox" id="box_list">
475471
<property name="visible">True</property>
476472
<property name="can-focus">False</property>
477-
<property name="margin-start">8</property>
478-
<property name="margin-end">8</property>
479-
<property name="margin-bottom">8</property>
480473
<property name="orientation">vertical</property>
481474
<property name="baseline-position">top</property>
482475
<child>
483-
<object class="GtkLabel" id="label_cat_name">
476+
<object class="GtkBox" id="box_cat_label">
484477
<property name="visible">True</property>
485478
<property name="can-focus">False</property>
486-
<property name="xpad">6</property>
487-
<property name="ypad">12</property>
488-
<property name="xalign">0</property>
489-
<property name="yalign">0</property>
490-
<attributes>
491-
<attribute name="weight" value="bold"/>
492-
<attribute name="scale" value="1.2"/>
493-
</attributes>
479+
<property name="orientation">vertical</property>
480+
<child>
481+
<object class="GtkLabel" id="label_cat_name">
482+
<property name="visible">True</property>
483+
<property name="can-focus">False</property>
484+
<property name="xpad">12</property>
485+
<property name="ypad">12</property>
486+
<property name="xalign">0</property>
487+
<property name="yalign">0</property>
488+
<attributes>
489+
<attribute name="weight" value="bold"/>
490+
<attribute name="scale" value="1.2"/>
491+
</attributes>
492+
</object>
493+
<packing>
494+
<property name="expand">False</property>
495+
<property name="fill">True</property>
496+
<property name="position">0</property>
497+
</packing>
498+
</child>
499+
<child>
500+
<object class="GtkSeparator">
501+
<property name="visible">True</property>
502+
<property name="can-focus">False</property>
503+
</object>
504+
<packing>
505+
<property name="expand">False</property>
506+
<property name="fill">True</property>
507+
<property name="position">1</property>
508+
</packing>
509+
</child>
494510
</object>
495511
<packing>
496512
<property name="expand">False</property>
@@ -516,6 +532,7 @@
516532
<object class="GtkBox" id="box_cat_page">
517533
<property name="visible">True</property>
518534
<property name="can-focus">False</property>
535+
<property name="border-width">9</property>
519536
<property name="orientation">vertical</property>
520537
<child>
521538
<placeholder/>
@@ -578,22 +595,24 @@
578595
<packing>
579596
<property name="expand">True</property>
580597
<property name="fill">True</property>
581-
<property name="position">2</property>
598+
<property name="position">1</property>
582599
</packing>
583600
</child>
584601
<child>
585602
<object class="GtkBox" id="box_subcategories">
586603
<property name="visible">True</property>
587604
<property name="can-focus">False</property>
588-
<property name="margin-top">5</property>
605+
<property name="margin-start">9</property>
606+
<property name="margin-end">9</property>
607+
<property name="margin-bottom">9</property>
589608
<child>
590609
<placeholder/>
591610
</child>
592611
</object>
593612
<packing>
594613
<property name="expand">False</property>
595614
<property name="fill">True</property>
596-
<property name="position">3</property>
615+
<property name="position">2</property>
597616
</packing>
598617
</child>
599618
</object>
@@ -1039,7 +1058,7 @@
10391058
<object class="GtkBox" id="box2">
10401059
<property name="visible">True</property>
10411060
<property name="can-focus">False</property>
1042-
<property name="border-width">6</property>
1061+
<property name="border-width">12</property>
10431062
<property name="orientation">vertical</property>
10441063
<property name="spacing">4</property>
10451064
<child>

‎usr/lib/linuxmint/mintinstall/mintinstall.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,6 +2244,7 @@ def go_back_action(self):
22442244
def show_category(self, category):
22452245
self.current_pkginfo = None
22462246

2247+
cat_box = self.builder.get_object("box_cat_label")
22472248
label = self.builder.get_object("label_cat_name")
22482249

22492250
self.current_category = category
@@ -2253,13 +2254,15 @@ def show_category(self, category):
22532254
self.back_button.set_sensitive(True)
22542255

22552256
label.set_text(self.current_category.name)
2256-
label.show()
22572257

22582258
if category.parent:
22592259
self.show_subcategories(category.parent)
22602260
else:
22612261
self.show_subcategories(category)
22622262

2263+
label.show()
2264+
cat_box.show()
2265+
22632266
self.show_packages(category.pkginfos, from_search=False)
22642267

22652268
self.update_conditional_widgets()
@@ -2281,6 +2284,8 @@ def show_subcategories(self, category):
22812284
child = SubcategoryFlowboxChild(cat, is_all=False, active=self.current_category == cat)
22822285
self.subcat_flowbox.add(child)
22832286

2287+
subcat_box = self.builder.get_object("box_subcategories")
2288+
subcat_box.show()
22842289
self.subcat_flowbox.show_all()
22852290

22862291
def on_subcategory_selected(self, flowbox, child, data=None):
@@ -2304,7 +2309,7 @@ def show_search_results(self, terms):
23042309
if not self.gui_ready:
23052310
return False
23062311

2307-
label = self.builder.get_object("label_cat_name")
2312+
label = self.builder.get_object("box_cat_label")
23082313
label.hide()
23092314

23102315
XApp.set_window_progress(self.main_window, 0)
@@ -2322,7 +2327,8 @@ def show_search_results(self, terms):
23222327
listing = self.installer.cache.values()
23232328
self.current_category = None
23242329

2325-
self.subcat_flowbox.hide()
2330+
subcat_box = self.builder.get_object("box_subcategories")
2331+
subcat_box.hide()
23262332
self.back_button.set_sensitive(True)
23272333
self.previous_page = self.PAGE_LANDING
23282334
if self.page_stack.get_visible_child_name() != self.PAGE_SEARCHING:

0 commit comments

Comments
 (0)