mirror of https://github.com/aseprite/aseprite.git
				
				
				
			Add options to sort the palette by RGBA channels
This commit is contained in:
		
							parent
							
								
									6aeee0b8fa
								
							
						
					
					
						commit
						ba4c34a70f
					
				| 
						 | 
					@ -348,6 +348,10 @@ void ColorBar::onPaletteButtonClick()
 | 
				
			||||||
        sat("Sort by Saturation"),
 | 
					        sat("Sort by Saturation"),
 | 
				
			||||||
        bri("Sort by Brightness"),
 | 
					        bri("Sort by Brightness"),
 | 
				
			||||||
        lum("Sort by Luminance"),
 | 
					        lum("Sort by Luminance"),
 | 
				
			||||||
 | 
					        red("Sort by Red"),
 | 
				
			||||||
 | 
					        grn("Sort by Green"),
 | 
				
			||||||
 | 
					        blu("Sort by Blue"),
 | 
				
			||||||
 | 
					        alp("Sort by Alpha"),
 | 
				
			||||||
        asc("Ascending"),
 | 
					        asc("Ascending"),
 | 
				
			||||||
        des("Descending");
 | 
					        des("Descending");
 | 
				
			||||||
      menu.addChild(&rev);
 | 
					      menu.addChild(&rev);
 | 
				
			||||||
| 
						 | 
					@ -358,6 +362,11 @@ void ColorBar::onPaletteButtonClick()
 | 
				
			||||||
      menu.addChild(&bri);
 | 
					      menu.addChild(&bri);
 | 
				
			||||||
      menu.addChild(&lum);
 | 
					      menu.addChild(&lum);
 | 
				
			||||||
      menu.addChild(new ui::MenuSeparator);
 | 
					      menu.addChild(new ui::MenuSeparator);
 | 
				
			||||||
 | 
					      menu.addChild(&red);
 | 
				
			||||||
 | 
					      menu.addChild(&grn);
 | 
				
			||||||
 | 
					      menu.addChild(&blu);
 | 
				
			||||||
 | 
					      menu.addChild(&alp);
 | 
				
			||||||
 | 
					      menu.addChild(new ui::MenuSeparator);
 | 
				
			||||||
      menu.addChild(&asc);
 | 
					      menu.addChild(&asc);
 | 
				
			||||||
      menu.addChild(&des);
 | 
					      menu.addChild(&des);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -370,6 +379,10 @@ void ColorBar::onPaletteButtonClick()
 | 
				
			||||||
      sat.Click.connect(Bind<void>(&ColorBar::onSortBy, this, SortPaletteBy::SATURATION));
 | 
					      sat.Click.connect(Bind<void>(&ColorBar::onSortBy, this, SortPaletteBy::SATURATION));
 | 
				
			||||||
      bri.Click.connect(Bind<void>(&ColorBar::onSortBy, this, SortPaletteBy::VALUE));
 | 
					      bri.Click.connect(Bind<void>(&ColorBar::onSortBy, this, SortPaletteBy::VALUE));
 | 
				
			||||||
      lum.Click.connect(Bind<void>(&ColorBar::onSortBy, this, SortPaletteBy::LUMA));
 | 
					      lum.Click.connect(Bind<void>(&ColorBar::onSortBy, this, SortPaletteBy::LUMA));
 | 
				
			||||||
 | 
					      red.Click.connect(Bind<void>(&ColorBar::onSortBy, this, SortPaletteBy::RED));
 | 
				
			||||||
 | 
					      grn.Click.connect(Bind<void>(&ColorBar::onSortBy, this, SortPaletteBy::GREEN));
 | 
				
			||||||
 | 
					      blu.Click.connect(Bind<void>(&ColorBar::onSortBy, this, SortPaletteBy::BLUE));
 | 
				
			||||||
 | 
					      alp.Click.connect(Bind<void>(&ColorBar::onSortBy, this, SortPaletteBy::ALPHA));
 | 
				
			||||||
      asc.Click.connect(Bind<void>(&ColorBar::setAscending, this, true));
 | 
					      asc.Click.connect(Bind<void>(&ColorBar::setAscending, this, true));
 | 
				
			||||||
      des.Click.connect(Bind<void>(&ColorBar::setAscending, this, false));
 | 
					      des.Click.connect(Bind<void>(&ColorBar::setAscending, this, false));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -61,6 +61,11 @@ struct PalEntryWithIndexPredicate {
 | 
				
			||||||
        value2 = rgba_getb(c2);
 | 
					        value2 = rgba_getb(c2);
 | 
				
			||||||
        break;
 | 
					        break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      case SortPaletteBy::ALPHA:
 | 
				
			||||||
 | 
					        value1 = rgba_geta(c1);
 | 
				
			||||||
 | 
					        value2 = rgba_geta(c2);
 | 
				
			||||||
 | 
					        break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      case SortPaletteBy::HUE:
 | 
					      case SortPaletteBy::HUE:
 | 
				
			||||||
      case SortPaletteBy::SATURATION:
 | 
					      case SortPaletteBy::SATURATION:
 | 
				
			||||||
      case SortPaletteBy::VALUE: {
 | 
					      case SortPaletteBy::VALUE: {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -17,6 +17,7 @@ namespace doc {
 | 
				
			||||||
    RED,
 | 
					    RED,
 | 
				
			||||||
    GREEN,
 | 
					    GREEN,
 | 
				
			||||||
    BLUE,
 | 
					    BLUE,
 | 
				
			||||||
 | 
					    ALPHA,
 | 
				
			||||||
    HUE,
 | 
					    HUE,
 | 
				
			||||||
    SATURATION,
 | 
					    SATURATION,
 | 
				
			||||||
    VALUE,
 | 
					    VALUE,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue